I think I would try to find some different ammo before doing anything to the rifle. It could be a not-so-good batch of 25gr. or your rifle might just shoot better with 17gr. or 20gr. As you can tell by my username, I'm not the one to bad mouth anybodies shooting.