After a bit of staring at the bike, I'm gonna go the shim route for now. I appreciate everyone's input. So far the bike has probably cost me more than what I paid for it but getting it back to new is worth it for my conscious if I ever sell it. The hiccups are part of the journey I suppose.