Just went to replace fuel hose and nipple on fuel tank snapped of due to being made thin by rust!!!!!!!!!!!!

I need a new tank, who apart from VW - either to hard to find or very expensive, make a good replacement - i have foung JK, VWHeritage and Justwatercooled sell them, but what is the best quality? Any suggestions.
Also once I have one, is it a good idea to paint it or cover it with waxoil?
Many thanks
1986 watercooled 1.9 petrol 48MM petrol tank inlet