ha^....i am always a caad advocate and am super glad you are keeping it! there are still ways to play with fit with out stem length ( saddle height, play with the spacers)...search the forums and play around with it..you may not need additional parts.
also try competitive cyclist fit calc.. it was pretty spot on for me, if you have someone else do all your body measurements correct. if the top tube is on your crotch, with cycling shorts and shoes on...its too big.
here is the link to the fit calc.
http://www.competitivecyclist.com/za...LCULATOR_INTRO