I had come across exactly the same situations where my clients interchanged the service and price. And had similar mess.
The solution here is reverse the new GR
change the price and quantity to original
Then reverse the invoice
Now again change the price and quantity as required
And then proceed with GR and IR
Regards
Vivek