No, most swaps are about as easy as any other...some just require more parts. A B series motor would swap just as easy as upgrading your D series.

I'd say swap...you'll get dohc, and a better platform to build on.

Just my .02