Edit: Offtopic, but I just wanted to say thank you for thinking ahead and providing so much information with your question I definitely respect your way of thinking too: fixing the problem itself instead of reflashing.