I wish you could try a genII JDM diesel. Great MPG, great handling, comfortable... it'd be exactly what you want, Les. But you can't import one, and swaps are so much of a PITA as to be not worth the time/$ unless its a hobby rig, and you wanna spend as much time tinkering as driving it. Not that that's a bad thing, but doesn't sound like its the route you want to go. So barring that, I'd go with a genIII, no hesitation. I'd probably still hold out for a 3.8. May as well get as much engine as you can, if you're trading up?

1991 HZJ77, 1999 KZJ90, 1999 UZJ100, 1992 M101CDN2
https://www.thegearheadproject.com/category/jdm-journeys/