sounds like your engine has alot of issues but what you really need to do is do somer searching around and write down all your prices and compare the complete price of the crate engine and having yours rebuilt. don't forget to add in machining cos...
i just put yj springs under my samurai with a spring over and went up to a local driveshaft shop and had some cv drive shafts made to fit the samurai you can see pics of it on my page