A Tarmac would not be a good commuter - I would definitely switched bikes, based on the type of riding you want to do. The Tarmac is a fast, stiff road bike and just isn't suited for gravel or even commuting. The Diverge is a much more versatile bike - or even consider the AWOL, which is more off-road and touring friendly.