I pitched all my plastic fuel containers. The ones they sell now are awful (as mentioned). I now use NATO jerry cans...easy to use, safe, and user friendly. These are NEW cans, not surplus. Link below.
Note: They are not cheap ($70 for a 5 gal) but I can use it for decades.
Scroll until you see "NATO JERRY CANS" on the left.