Well, first off, welcome home, and thanks for being there.
Nextly, looks like a nice YJ you found. I didn't have much luck, or love, with the 2.5 that was in mine when I bought it, but I don't recommend the drastic steps I've gone to. I would suggest having a good look at the tons of build threads on this forum. With the 31's, if the stock 4.11's aren't spunky enough for you, swapping to 4.88's will perk things up.
That being said, if you plan to go to 35's, you won't want to drop that cash in the stock axles. They just won't survive even moderate wheeling with that big a tire. I have met that Louisiana gumbo mud, and it won. Before you bolt a set of 35's up, you really need to find a set of Dana 44 axles, or the equivalent to hold the extra torque and wieght involved with them. Good luck, and feel free to PM if you have any questions.