I was kinda in your boat not to long ago. My b2 has been in my family since it was new. Was my first vehicle in high school. When I left home my parents put it in the garage and it sat there. 5 yrs later they wanted to sell it and told them nooooo! Shipped it to where I lived and started fixing everything. Engine turned out fine, just needed basic maintenance items. Rear axle was shot. Tranny was ok. I decided if I were to fix anything it would be with something to make it better. Rear axle swapped to 8.8. Fixed little things as they came up. Drove it till tranny completely died and then decided to do the 4.0 swap. This is the first vehicle that I've ever worked on so learning as I go. To do 4.0 swap, wiring was kind of a pain and I still have some bugs, but it works way better than my 2.9. Even with high gearing and bigger tires. Mechanically the swap was a pinch. Followed the chiltons book step by step. All that said. I would pick up some heads from a junkyard, do your basic maintenance and see if it solves your problem. Then fix things as they start to go. What you decide to fix them with will depend on your ultimate goal for the vehicle. I have loads of sentimental value in this vehicle so no hardcore wheeling for me. Still doesn't stop me from trying lol! Don't be scared of the 4.0 swap. Find a good donor vehicle and keep trs and some brews handy and you'll be fine. Just dont dive into swap cause everyone says too. Try cheap fixes first. If it turns out you'd spend close to the same amount a swap will, then a swap justifies itself if that's what you really want. Just my 2 cents