[SSLance]

I've always been told to not make major changes (upgrades) to the top end of an engine without being positive of the condition of the bottom end first. In your case it seems like the questionable parts might be the rings and bearings which you won't know without pulling the long block apart.

If I was on a budget just to get it back together and running again, I'd lean towards just a new cam\lifter setup that will work happily with your heads and compression ratio and call it good. I wouldn't make any major performance enhancing upgrades without going through the rest of the engine first.

The pulling and disassembly of the engine isn't much more work than you have already done and if it is all good inside, you might be able to get away with just replacing the bearings. This would also give you the chance to fix all of the leaks properly.