My recommendation: I'd take whatever ammo you shot 0.6 MOA with, get about 100 rnds of that, go and shoot 10 10 round groups as best you can, with a clear mind and as best you can forgetting the frustration you have.
If you still average 0.6 MOA, then your rifle is fine. What's more important...