[Engine] M59 replace diesel fuel tank & heatshield plastic fixings

[BLINGO BOMBA]

OK, still looking to replace my diesel fuel tank, 2006 1.6 hdi.  Citroen gave me a part no. of '1500FG' for this obsolete part for my vehicle, but this part no. doesnt seem to relate to anything on ebay etc.
Does anyone know if the 1.9/2.0 tanks are the same as my 1.6?  Citroen couldnt tell me unless i had the reg nos.

Has anyone had a successful reliable diesel fuel tank repair?

Also the plastic clips/screws securing the heat shield to the tank are also unavailable, has anyone found an alternative source for these please?

Cheers..