Nice jeep. Your options appear pretty clear. Stick with the larger tires and upgrade your axle ratio or sell your current tires and go back to a 30 inch tire or smaller. Looks like the cost is close with the axle swap a little more expensive.
2013 Commando Green Unlimited Rubicon with Warn winch, Tnt Midwith front bumper and TnT adventure rear bumper, 4" OME lift Tnt short arm kit, full skids, front axle truss etc..., Rock Sliders, Rigid2 lights, teraflex tire carrier and other stuff
2003 Sahara 4.0 already miss it