I'd opt for 2.2. At least it gives you the option of turbo-ing the car later on if you decide to do so.
Turbo a car 'later' w/$5-10 gas & bunch of worn out engines that need rebuilds & parts you can't get anymore?
Surely, you jest?
Swapping & re-pinning or moving the AMM w/a sub-harness extender & adding the 700Turbo EZK to the existing 240 fuel harness cleanly will be the least of your concerns IMO or shouldn't be that big of a stumbling block, either way?
That, & everyone threw out the awesome B21FTs (of the choices of SOHC Volvo Turbo engines, anyway?) & installed the sub-standard core-shift prone/worn bores B23FTs &/or B230s, which are junk.
The guys in Sweden know what's up/they run B21Ts if recombining the OE 'all junkyard' junkpile to boost the crap out of them.
Thick liner narrow knock resistant bores, stick a thin HG on it to get the compression closer to low 8s or custom mirror dish forged pistons & SCP 405 head, boost the crap out of it!
To OP, I guess I'm biased toward originality if at all possible & only junkyard/used/NOS OEM parts recombine & only convert away from original as needed, but I'm not an originality purist, but refuse to buy any new chinesium or craptermarket if at all possible?
(this isn't to disparage Dave's harnesses which have been good quality to install if I couldn't source an OE used replacement/updated harness or EZK or a turbo engine install was desired, for whatever reason?).
As to the round plug updated Bosch dist for '81-'83...IIRC the mopar box works w/any of the '81-'88 dists & you can make a sub-harness for that as needed or swap the ignition harness to the '84+ style w/the later dist plug?
The EZK only works w/1 or 2 types of 240 dist, however IIRC or the '84 760T block mounted dist?
Many of the -'85 dists are worn out junk/timing wobbles around w/wobbly shafts & neglected oil wick on the mopar ignition cars.
That said, if oiled, they last ok?
The '86-'88 small shaft rotor/no oil wick (wicks it up from the gear/has a thrust washer IIRC?) don't seem to suffer this problem & timing seems more stable w/updated mopar box & harness & map sensor doesn't seem to fail on those...
Rotors are difficult to source for the '81-'83 white cap dist, but the Bosch retrofit dists w/round plug exist in usable not too loose condition used & last fine if you remember to oil the wick for the '81-'83 mopar ignition cars.
Or maybe they only exist in mine and a few other dork's parts hoards IDK?
It's not so much the hall sensor itself that goes bad as the tiny wires or connector that breaks?
I've had better luck with original hall sensors or those purchased when the cars were still in production?
Some other cars use that sensor for the 'cam position reference' up into the late 1990s? or so...they're 'around'
?