Re: Stock with higher cheekpiece/comb?
There are a host of options.
First, determine if you have the proper scope rings on the rifle to accommodate your optic. I see tons of people using ridiculously high rings that put their scopes in untenable positions when they don't need nearly as much height. If you have room/clearance to bring the scope down somewhat, then different rings may be the best route to take before you go off swapping stocks.
Second, if your rings are ok, then decide whether you want a "fixed" stock or if you might consider going to a collapsible unit.
If sticking with fixed, then:
1) Magpul PRS (arguably one of the best options, tons of adjustability/flexibility, but...weigh a ton compared to other options, are a little "bulky" at times, and are pricey compared to other options.);
2) Keep the A2 and use some form of cheek pad. There are multiple options in that vein, including the ultra-cheap DIY stuff (like an old mousepad that is 100MPH taped to the stock in whatever height/layers you need). Not the prettiest thing going, but highly functional as long as you move the material back far enough to permit proper operation of the charging handle. You can also find specific products for this purpose like those made by Kick-eez, Pachmayer, etc. There are also the more traditional "stock packs" like those from Triad, Eagle, etc., but again, you have to be cautious in using those as you have to get them back far enough on the stock to clear the CH. Finally, there are also products like the A2 "Delta" style cheekpieces, but I'd advise against that route. They are designed to get your cheekweld up high enough to use the basic A2 stock with optics mounted to a carry handle mount and because of that REALLY high comb it offers, it'll likely be TOO HIGH for your current setup.
If you want to go collapsible, here are a few options:
1) a Magpul CTR stock fitted with a Larue RISR (again...lightweight, lots of adjustment for length given the collapsible stock, etc.);
2) a SOPMOD with a Battleline Industries SAPR.
With the collapsible options, just remember to factor in the cost of the mounting hardware (new receiver extension, castle nut, endplate, buffer and spring...plus the tools for the job if you don't already have them). You can quickly get well over the cost of a PRS when factoring all that in.