AHR has a CZ #1 upgrade that I highly recommend. It used to include install a 3 pos M70 type safety, a match single stage trigger, and straighten and fill the bolt handle. If I were you I'd leave it a 375 H&H. Like you said, you can always make the stock a little slimmer. I had the CZ #1 upgrade done to my rifle and love it.

[URL=http://s247.photobucket.com/user/chuckscap/media/500_Jeffrey_3-1.jpg.html]

[/URL