Browning X-bolt and a Burris 6.5-20x50 is a very nice combo. It is my go to rifle but mine is a 300 WSM. Nothing wrong with the 7MM mag though. I think it's a good idea for you and your buddy to shoot the same ammo. My buddy and I do the same. I'll post a couple of links.
http://www.cheaperthandirt.com/product/52572
http://www.midwayusa.com/product/313...-reticle-matte