if i were in your shoes
if your planning on replacing the tank anyway, you should try forming the fiberglass, like you did to the headlight ... if you #$%* it up , you were gonna replace it anyway .
edit: now that i think about it , not sure that would work ... but .. i'm not sure that it wouldn't either