Thanks for the replies guys,
I must admit relocating the tank is priority, although I do consider it safe it’s never great having a car that stinks of fuel constantly.
Weighed up a few options and I think I am going to make my own tank to fit between the chassis rails and cope with the smaller...