It will fit and it is a better setup. Thats why GM made the change. Trash settles at the bottom and used to get caught in the petcock. With top draw, the trash stays at the bottom. Just modify your fuel line to fit. There is a guy on eBay that sells fuel tanks on eBay for $174. They are made in Canada by Spectra Premium. They are much better than the Asian reproductions. I have bought well over a dozen tanks from the guy. Check out item No. 262027484310 on eBay. I just recently bought 2 of the early ones and 2 of the late ones from. His stock may be running low.