Mazda 20B for the WIN!! LoL J/K!
Pretty sure LSx series as you have mentioned for easy access on the engines and tons-o' parts. Already proven, plus knowledge base is there since its a pretty common swap on our 80s.
If parts were readily available I would go with a OM606 or 1hdt.