The dana 30 and 35 under your jeep arent known for their strength. If you get a 4.0 you will also need a new transmission. The ax5 in your jeep wont cut it. You'll need an ax15 or nv3550. You'll end up with dana 44 axles. Basically you are asking for a sink hole for your checking account. If it bugs you that bad, sell your jeep, take some of the money you would spend on repowering and find a tj rubicon.
Just my opinion. If you wonder why I say this.
View attachment 137328
I sold her three days ago at a huge loss, I'm still sad. At least my jkur is in the garage.