Think you have already sold yourself on the idea of "polishing a turd" but is not worth it, even at "half the price" of a full swap. You can only get so much out of a 3.6 and saving up for a full swap is really the only option. Yes is expensive, but will save you a ton of headache down the road...