tj axles

After much searching my latest approach to my TJ high gear problems (3.07 gears w/33 tires) is to swap both front (Dana 30) & rear (Dana 35) for available Dana 44 with 4.10 gears from a Wagoneer. My thoughts are to clean up both axles (drain & inspect lube, inspect gear wear, replace axle...