I'd probably look at a touring or cyclocross bike to use for road riding and commuting then do a rebuild on the Norco. That gives you a road bike and an off-road bike. Then start saving for the sport road bike which will allow you to make the touring or cyclocross bike into a dedicated commuter/tourer.