Hi Frank, and welcome.
Sorry to hear you're having problems. I have no direct experience of a Paintman fuel tank, or of any issues with them, so might not be of much help to you. All I could think of to possibly offer a bit of help was to measure an old original tank of mine. Well, three tanks to be precise, to get an average masurement.
The outer diameter of the top lip is 109 mm. The lip itself is 4mm wide, The top face of the lip is 16.5mm from the top of the tank itself.

- TANK 1.jpg (332.24 KiB) Viewed 18505 times
The inside diameter of this lip is 99 mm.

- TANK 2.jpg (221.49 KiB) Viewed 18505 times
The thin inner seal retaining ring inner diameter is 90/90.5 mm and it is 4mm down from the top face of the outer lip.

- TANK 3.jpg (1.06 MiB) Viewed 18505 times
The inner neck of the tank, (with the lugs for the removable filler neck), also has a 90 mm diameter, and is 16 mm down from the top face of the top lip.
I haven't measured the filler cap as yours is original and obviously fitted the original tank okay.
I hope this may be of some help in some small way to compare the the Paintman tank you have.
Regards,
For Those That Have Had To Fight for It, Life Has Truly A Flavour The Protected Will Never Know.
'First my weapon. Then my equipment. Then myself.'
Neil.
09FM98. 1973 Ex SIII FFR Now 3.5 V8 LWT Coiler.
55HG98. 1980 SIII FFR PARA RECCE. Ex 1, 2 and 3 PARA.
Td5 90 XS.