I spent about 30-45 minutes laying under the Jeep with the shorty header in my hand looking at how things would fit. I at this point I think that using the block hugger headers are the better option at this point. But I'm going to give it one final look before I make a final decision. I'm willing to give up that 1" of up travel at this point since sometime in the next few years I'm going to have to build a new front axle and when I do that I can build it to get that inch back.
If I can fit the shorty headers it will mean I'll have to reroute some of the plastic lines I have running in the area around the firewall.
Good plan. If a new axle is in the future, then just run what you already setup previously. That way you can get it out on the trails where it belongs!