I think I'll be pretty much doing that, just in a roundabout way. Everytime I buy a new component its like putting money into a new bike just getting actual use out of it. This way in six months when I've maxed out this bike I can just buy a new frame and switch everything over. I get just as much joy out of working on things as I do using them so when I finally do get a new frame instead of making a big leap I'll already know how each of my components work and how to fix them.

I appreciate the suggestions and I think I will start with the fork and the wheels. I have to true my rear wheel almost every other day so it is definitely the weakest link.