Got everything swapped out yesterday, haven't had a chance to load up the bed yet and see if that noise is gone but I still do get the clunk when shifting into D. Doing some more research seems it may be an issue with the slip yoke needing lubed so I'll yank it off again to do that real quick. Thanks for your help, it's appreciated!