Always best to take care of the upgrades immediately. If you wait too long, the upgrades have more value than the bike. As you can see, it's simple economics to do it all now.
__________________
Some people are like a Slinky ... not really good for anything, but you still can't help but smile when you shove them down the stairs.