Sounds like its time for 2 bikes: one for the commute, the other for the kind of fast riding you want to do. It's hard to beat a vintage MTB for a commuter; they're relatively cheap, they have lots of room for decent volume tires, and eyelets for a rack and fenders.