1973.5 911T CIS Correct Fuel Filter Configuration? Correct tank finish-look?

[AustinPorscheBill]

Here's the situation.

I have a 1973 1/2 911T with CIS (gold in case anyone is interested).

Purchased in 1994 (second owner), I did my first restoration (body off) in 1997-1998.

Then in 2011-2012 I did a second lighter restoration (selective refresh, mostly suspension, cosmetics, expandable oil return tubes, etc.).

I let it sit during Covid, now want to get it running again.

Tank was shot (after a "boil" cleaning during resto 2.0, it had to be patched, so some pretty thin metal all around), so I have an "unobtanium" replacement tank with the brazed-on fuel barbs (not screw-ins), swirl pot and full-sized spare capable.

During either the 1.0 or 2.0 resto, I replaced the fuel filter with a modified setup as the original filter was as best as I could figure no longer available.

Picture is attached, the 15 year-old filter is a Bosch 0 450 905 016.

It no longer is secured in the stamped metal mounting bracket with a hose clamp but rather "floats" on the short angled and flared(?) metal tube from the pressure regulator(?).

This configuration worked for me for 15-20 years, so am wondering whether I should stick with this modest mod or whether I should go on another unobtanium quest for an original filter.

One of my concerns is that I don't remember exactly what I did to make this modification? Did I bend that short flared tube? Something else?

Any advise would be welcome.

I also have a question regarding whether I should wurth rough undercoat-gray top paint the new tank to take it back to factory-original -- if in fact that rough undercoat on top-and-bottom, followed by grey primer-ish paint-on-top only on the old tank is in fact the original look).