Just freebore your 7RemMag as it sits, get some good brass, H1000, 160-162 grain bullet, and be done with it.

Your not loading it to its potential. You need to figure out those problems first before building something else.