In addition to Off Road Mod (to minimize EGR input), I would unplug your fuel heater element as it is a safety problem. I'm on a crusade to get this recalled. You can read the reasons and instructions on this thread:
http://www.lostjeeps.com/forum/phpBB3/viewtopic.php?t=24616&sid=856abfc80355de8015ad8e0dec22d3c0
I'd spend some time looking at the amount of air in your filter head. Thing is a POS design, so keep an eye on it. Some genius at DC never put a lift pump on this rig. Gonna cost them BIG TIME when the NHTSA gets them.
You also might take a close look at airbox mods (or an Amsoil filter), but you may already have done that.