Have a local shop do a short block. You can pick and choose components for not much more. Then find a 4.0 head, get a cheap "fractory" style header, then grind on the intake a bit to get it to fit. That way when you do your FI swap later all you will need for the engine is a stock 4.0 intake which can be had for cheap.
1986 CJ7, 4.2 w/4.0 head, TFI-HEI hybrid ignition, Clifford manifold w/Holley 390 w/cold air intake, OBA, 4.5" lift, Woody CV shaft and Tattons in front, 4.10 gears - lunchbox in front, Truetrac in the back, twin-sticked, blower upgrade for running topless, trying to keep it simple.
It's just a Jeep, and if you don't wheel it once in a while, it's not even that.