Check out 4L and MPFI swap threads. Lots of guys use the PDC from the donor YJ/XJ. I will be as well when the time comes but it'll be sitting on my shelf for a while yet. The YJ/XJ ones are pretty big and cumbersome compared to what you have now but they have plenty of relays and fuses available for different electrical items. Nice thing is if you cut one out of a donor and leave plenty of the harness you could mount it pretty much anywhere in the engine bay and wouldn't be limited to the inner fender.
'84 CJ-17: 17" stretch, locked Toy axles, 5.5" lift, FI, AX15, D300 w/twin sticks, boatsides & junk.