the H&K tool requires the removal of the gas port as it is like a tube / sleeve that slips over the barrel from the muzzle. This one has 4 notches that fit into the nut that holds in the barrel.
You can make your own, (or find a home made one for sale online), that does not require the removal of the gas port, its like a C shaped tube / sleeve (i.e. a piece of the sleeve has a section removed from end to end that the gas port can pass through when you slide it over the barrel), that has only 3 of the 4 notches. Guy on HKPro that uses one of these claims it works just fine.
If you're going to replace your barrel, I'd be interested in buying your old one for a little project I'm thinking of.