Since you have already decided to keep the 6.5x55, you are down to making one more choice.

If I had a 30-06 that I loved (as you do), then I'd just keep that and move on in life.