Okay, so I ended up doing a headlight retrofit project on my '98 5.9L ZJ, just like with my past Jeeps.
First set on my 1996 ZJ Laredo:
Second set also on my 1996 ZJ Laredo:
Second set on my 1996 ZJ Limited:
EDIT: Finished on my 5.9L:
For the 5.9L I ordered a Stage III...