Keep the HF distributor and manifold and SKIP the DPFI conversion.
Later on, if you want to work the D a little; Si camshaft/Y8 cam gear, Si ECU, PM7 pistons, Si manifold; and you'll see a noticeable gain.
There are guys with D-series putting down more power than the B16 for less the price of the swap. But, if you're looking for more power later on then B-series will be a better route.