There is/was a vintage filler neck & cap on ebay. As for the tank, that fitting was usually welded, so a new poly tank ($125) is probably the best solution. Best of luck, RJ