I've heard of the gauge swap but haven't yet read anything on it. As far as the tank goes, I'd stick with your original tank and just swap the fuel pumps and save yourself a lot of fitment issues. There are quite a few things that are compatible but from my experience its been much easier to stick with what came with the truck originally. And another lesson I learned is, don't swap your dd which I had to find out the hard way. It took a lot longer than I expected, because waiting on shipping kept me looking out the window for the guy in the big brown truck