I received the new fuel tank hardware to start on the fuel pickup and return fittings again.
First I replaced the conflicting rivet of the fuel drain with a shorter one of 10 mm.
For the fuel return I used the narrow aluminium washer provided by TAF on the inside and an AL960-916 on the outside.
And for the fuel pickup an AL960-916L washer and on the outside an AL916-960 washer.
Also here I applied some sealant on the outside of the B-Nut of the fuel pickup.