Water Ballast Upgrade

Happy holidays all:

A project for me this Winter is to upgrade my ballast system on my
PIK-20. I have two questions and would appreciate any assistance.

(1) One of my bags has a single pinhole leak and I wonder if this can be
repaired in a reliable manner. The material seems to be a thick rubber
impregnated synthetic fabric and if it matters, is orange in color and
is the original factory PIK bag. If it is rubber, would a tire patch
material be reliable? If a repair would be deemed unsafe, who sells new
bags these days.

(2) Who do I contact to purchase the Nixon type dump valve.

Regards and many thanks,

Paul