I got to remove a rusted bolt on my windshield frame too one of these days, and when it broke the Jeep was only three years old.
As far as wiring is concerned, I wonder if you just can't use a different fuse to lower the resistance. other than that you must have bought a new dash because yj's shouldn't accept round guages if I remember right.