I have found in the past that generally quick fixes cause more problems in the long run than actually fixing any problems. Spend the time planning now and you will save a lot in the long run.