I'm a big fan of fitness training.
As a regular commuter and organized ride rider, I'll offer this. Ride for the joy of it, and ride to get there, and the fitness will simply follow. Your exercise can then be combined with so many other "normal" activities, and you'll simply find that you get both fitter and faster.
But that's just one bike commuter's take on it.
__________________
Good night...and good luck