The fix is a stiffer mainspring. You loose a little bit in gas efficiency, and sometimes you loose a bit of the top end velocity, but most places don't let you shoot more then 280 anyway.
However, if you are going with a level X bolt. Just wait to put that in. Then you will have a few days of tinkering anyway to get it to work just the way you want it.