Ditch the road bike, buy an aluminum Diverge and a second set of lightweight roadie wheels. One bike with two wheelsets is the way to go when space is limited.

I'd buy an AWOL and a second wheelset, I like riding 40mm tyres.