Looking for a factory or factory style gas tank for my 2004 tj Rubicon. Rollover valve in my current one crapped out and is spitting gas out the vent. Checked with Jeep dealer but the tank has been discontinued and as far as I can tell there is no aftermarket production other than the genright aluminum tanks, but they are a little pricey for me. Thanks!