Wooky,
If your considering an engine swap, I would go with a 1.6L 16V. I did mine last year, got a 1995 Sidekick engine delivered to my door for $740.00 from JDM out of NJ. Guaranted to have less than 55,000 miles. Their prices may have gone up a little, but is was a good deal. All total for the engine swap about $1100.00. Had to buy an adapted plate for the trany, Sidekick wire harness and ECM.
1988.5 Samurai bought year ago September, barely ran to make it home.

Today:


Rebuilt front end, king pins, bearings, seals, calipers, brakes and tie rod
Rebiult rear end, bearings, replaced axle, wheel cylinders and brakes
1.6L 16v engine mod
Homemade hardtop
interior sound proofing, butyel rubber, 1/8 foam then 1/16 inch rubber on top
headlight upgrade wired to relays
X90 seats and reuphostered
CJ/RUF lift
Built custom winch bumper and rock sliders
installed two batteries
electric fan
painted with rattle cans
Some of mod shots:














