Just a thought, but why not run the 5.9 long block with the 5.2 intake/electronics? I don't think it will make it run poorly, and I've heard of many people running stock/very mild 5.9s on 5.2 computers. I have a mild 5.9 running on a 5.2 computer, but it has been tunes via SCT Flash which you unfortunately don't have that option unless you swap to OBD2.