Seems that my 2.5L has a flat cam lobe. Lifter has been replaced and I've still got a consistant rattle. The motor has some blow by and runs OK but not great. So rather than wasting a lot of time on a disposable motor I've got a couple options.
1) 97 TJ 2.5L - guy in a local club has one that comes with a 5 speed I don't need for $500. Probabally the easiest, but it's still a 4cyl
2) L67 (Supercharged 3800) - nice and light, plenty around and cheap. I already have the correct bellhousing that would allow me to bolt it to the AW4
3) Cadillac 4.9 v8 - Not as cheap but more power and uses the same bellhousing as the 3800
4) Olds/Cad Northstar/Shortstar - bellhousing would need a couple mods, but also a bolt up.