Motorhead is great highly trusted and recommended as well however this (Hatsan got crappy regulators anyway) DIY will probably be cheaper than round trip shipping and insurance (unless you just mail the cylinder).
Pomona airguns, IF they're still in business. I've never used them so don't know the quality of work but called a couple years ago to see if they did airgun smithing.