Vegas,
You didn't state if you have a HBAR barrel in your post or not, but I'll throw out another option.
If you have a HBAR barrel on hand....here are a few things to consider. If the HBAR is a good shooter, you can send it to Steve at ADCO or any other good gunsmith and have him re-profile the barrel to your specs. If HBAR is too heavy and Gov't profile is too light Steve can profile the barrel to YOUR specs.
The cost of reprofiling a barrel is in the $50 to $75 range. If the barrel is not the length you want it, the barrel can be cut down as well. Steve has re-profiled 4 barrels for me and cut one down. He does awesome work, at a fraction of what a new barrel would cost you.
My recommendation is only upgrade your equipment when it is hindering you, if you can't shoot to the barrel's capability why spend $300 to $500 on a new barrel? If you are more accurate than the HBAR barrel, then I would say it's time to invest in a Noveske / ABS / Global Tactical barrel. Just my .02, your milage may vary.