On the other hand, if the OP wants to be riding the same bike for the next twenty years, he should probably avoid carbon.

His frame is made of double butted quality steel from a regarded manufacturer. Can't see any reason to change. It might be fun to try out some different geometries or materials, sure, but hardly needed.