Sounds to me like a 17 HMR would be right up you alley. I'd recommend a Savage of Marlin. If you're planning on replacing your A bolt, You may want to consider getting another in a shorter action. Like the Micro Hunter.
You can also look into the Tikka line of rifles.