The fuel tank in my boat needs to me replaced. It is leaking and I think there is a problem with the pickup. What is my best option? Aluminum, plastic etc? It has an 85gal tank in it now, however I am repowering with a 1999 250hp Johnson ocean pro. Do they make a 100gal tank that will fit in the same place as the 85? Would I need more than 85gal?