degan

I know you said you want to keep the crankset but converting it to a 3 piece will make a huge difference. They're pretty cheap on ebay so you can switch back without too much of a loss, they're about as easy to overhaul, and open up tons of options.