Thats a good idea. Its not really all that hard to do either. While your swapping you can go ahead and move the gas tank at the same time. If you upgrade to a later year of tank you'll not only get a higher capacity but it fits between the framerails perfectly.