Update time. So, the annoying lack of power when it's hot issue finally got bad enough for me to drop the tank and clean it again. Put new seals on the pick up and sending units and a new lower filler hose.
I hadn't gotten around to removing the glass, clean-able fuel filter (pre-pump) and it plugged up with tiny particulates causing pretty severe fuel starvation. Replaced it with a cheapy plastic one and, voila!, much better.
Made an...adjustment to the underbody a bit where I was getting an annoying drive train buzz. This, of course, only popped up after I was a good Jeep owner and replaced the sagging trans mount a couple months back.
I'm still battling the lack of power, before it's up to temp, from the AE. It bogs down if I give it a bunch of fuel, but clears up after 2 or 3 seconds and/or I let up off the gas to 50% throttle or so. But, it goes away once it's all warmed up so...
I've got a lot of minor housekeeping things to do but I'm thinking of selling it at some point and moving into a Wagoneer. With the son almost a year old, it's just to big of a pain to get him in and out of a rear facing car seat, especially when sleeping. I'd also like something with AC, for our rather warm summers. I love, love the Cherokee. It's been fun, but 4 doors would be really ideal.