First an apology, the photos have been hard to manage because our old point and shoot camera (the one that I don't mind sitting around the garage/workbench while I work) has pretty much given up on me, I get about 5 photos per charge, if that, then I have to charge it to get the pics off and do it in a hurry.
I hope to get more pics up now that teardown is pretty complete and I'm starting on the install. I do have some fun ones with Laura and Kate getting in on the action
With the holiday weekend/honey do list/house projects, I didn't get anything close to the time I'd hoped to work on this, but made some progress.
Water pump, pulley, fan
I swapped out the H2O pump for a wrangler (TJ or YJ works) pump to get the correct pulley/fan shaft. The XJs use an offset mechanical fan on the idler pulley, so you have to swap the water pump to use a mechanical fan. The serpentine setup on the 4.0s spin the fan pulleys the opposite way from a 4.2 V-belt because the back (flat) side of the serp belt is on the pulley as opposed to the V-side of the V-belt (the serp 4.0s spin the same direction as a serpentine 258 though, so if you happen to have one of those, you're set for the fan, but you'll still need the pulley I think if you're using an XJ motor).
Because of the reverse rotation (compared to my V-belt 258), I needed a YJ/ZJ/TJ fan to match, so I got one cheap off eBay, complete with the clutch. This fan direction issue is the case regardless of the year/OBDI/OBDII, btw.
Boring pic of a water pump, still waiting on the pulley.
New valve cover gasket
I pulled the valve cover to clean it up and work on the slight leak at the rear. Found I needed a new gasket, got that ordered and got a new thermostat while I'm at it.
Throttle body spacer
In a funny Jeep karma twist, I found the Poweraid throttle body spacer that I put on our old 97 XJ sitting on my shelf (removed prior to selling the XJ, meant to sell it off), so I slapped that on.
Motor mount brackets
I pulled and cleaned up the motor mount brackets from the 258. Had to grind the front edge of the left-side mount to clear a reinforcing web on the block. Swapped in new bolts and drilled the rear bolt hole on the left-side mount to fit a 1/2"-20 bolt to match the tapped hole in the block at that location. The 258 and 4.0 use different block holes, but they're all there (apparently newer ~2000+ 4.0s are more complicated than this and require fabbing mounts, check on
www.cjoffroad.com if you're looking at one of those motors for a swap to make sure). I also had to cut down one oil pan stud that was interfering with the motor mount on the left side. It had a plastic tiedown to mount some wiring that I won't need. Finally, I did use one washer per location behind the left side mount, between it and the block) for a little extra clearance.
I have new PolyPerformance CJ motor mounts that I'll use when I install the motor.
Pic of the right side mount (my driver side):
Left side mount, the rearmost hole needed to be drilled out to 1/2" to use a 1/2-20 fine thread bolt
Tranny/tcase adapter
Pulled the front input on the tcase and installed the dual-sided input shaft seal that came with the adapter to keep gear oil from meeting ATF. Snap ring on the back side of the input gear worked my snap ring pliers for all they were worth, don't even try this without the proper pliers and get heavy-duty ones.
Reassembled the input and checked out the twin stick setup I built a long while back. Will just need to drill the holes in the shifter blocks when I fit it all up and see where the shifters need to sit and check about bending the shifters.
I put the tranny mounting studs in the 3rd of 4 sets of holes to clock the tcase. Need to play with it before I decide how far to go, I'd like it as flat as possible, but I don't want to get into an insane amount of work to fit it up.
I figure I'll modify the stock crossmember to mount the tranny end, so I cleaned that up in preparation. Figure I can pie-cut as needed or just slice and overlap with some BFH love and welding to flatten it out (can't wait for that part).
Adapter on and new input seal, green, double-sided:
Fuel pump/regulator/lines/filter
I got an E2000 pump, EFI regulator and Fram G3 filter to mount on the frame crossmember in front of the tank. Got the regulator and pump mounted. Need to cut and flare the stock gas line to pipe it all in, but I ran out of time this weekend to do any more.
Setup on crossmember, from left to right, adjustable regulator, pump, filter (EDIT - I ended up replacing the pictured regulator with an edelbrock unit):

New fuel line:
So that's where I'll pick up when I get home this weekend.