I'm with Ryan on this.....although i'd be tempted to get another BSA barrel or a machined CZ if you're still inclined.
I have the VFG kit and a rod kit with all the attachments you could borrow if you do decide to go down that route. My older Steyr kept going off the boil with grouping so i took the 10 year old barrel off and put on a new Steyr barrel and all was sweet again. I decided i would give the old barrel a really good beasting with the rods over a 4 week period to see if it made a difference. that barrel is now on a mates Steyr and he says it's spot on again, even after a few thousand pellets through it.