Swap it man. Yeah there are some D-series engines that are built well, but IMO why build a D block when it sounds as though you already have your mind made up to eventually get a B engine.