Great idea to go 4.6 instead of 4.0. I think this holds for any V8 Rover, honestly. If you're going to the effort of a swap, go all the way to a 4.6. Anyway, I'm not very familiar with the electronics of the D2, but I can't see how you could go wrong just finding a donor D2 in a junkyard, or a cheap complete parts D2 that originally had a 4.6 and swap everything over from there. On the other hand, it's possible you may just need a different ECU and the 4.6 itself. Need the D2 guys to chime in here. I myself would post this over on Discoweb too, since once you get past the B.S., there's no better pool of tech knowledge on these trucks than there.
David