There is truth to the fact that there are more options available in 308 than 7mm
Because you already have a 7mm Ultra Mag, I would get the 7mm-08 and be very happy.

However buying 2 rifles of the same caliber, either 7mm or 308, just to simplify your component shopping doesn't make any sence to me.