If you would like to come and see what I did with my cj8 I'd be glad to show you. I put in a 4.0 from a 99 TJ, AW4 auto from a 95 cherokee, and dana 44 axles from a couple of wagoneers. I kept the dana 300 since it only required a simple adapter/clocking ring to bolt up to the aw4. The 4.0 uses the same motor mounts and brackets as the 258 and will bolt up and fit just fine. I used XJ cherokee wiring for the engine compartment and half of the interior wiring so that I would have cruise, delay wipers, light dimming and wipers on the column. I know the 4.0 isn't as cool as a V8 but I wanted to be able to pass a gas station now and then (unlike my 360 v8 cj7 that I used to have). Now if I could just finish the body work.
Dave