Keep Kilo as commuter, spend as little as possible on it save keeping it running well. Maintain it.

Build second fancy bike for your endurance/high performance riding. Start with a frame that fits, then fancy wheels and tires.

N+1 > fashion show commuter/theft bait/jack of all trades master of none bike.