So cross referencing the parts that I need with the 4.0 parts, I managed to upgrade to the 4.0 front spindles and carriers, rear carriers and CV axles F/R, the bleeder shock caps (and mounting hardware) and of course, drive boots.
It cost me less than $30 more than if I were to stick with the 3.0 parts. Well worth it...