Given that, I'd start slowly and make the changes one at a time based on what you think will please you the most. I'd also keep an ear to the ground, so to speak, and be ready to pounce on a bike that comes up on your local CL that really turns your crank as a wholesale upgrade from your current bike. Then, as Tom says, you'll have two bikes, one for utility, one for emotional gratification. Of course, from there, N+1 follows easily, mwahaha