Got the new bike. It is an utter revelation. 3mph faster, heart rate 10bpm lower, 20% further, and less sore in the end. I'll need to set aside more time for my rides in the future if I'm going to keep pushing.
Of course, these new speeds are even more dangerous without a headlight...