Final update for me - I installed the mile marker 501 kit, and replaced the differential carrier with one with non-chewed up teeth, and found a replacement spacer at a local trans shop. All back together and filled with 10w30, no more noise, shifts well, and as a bonus the driveline clunk I used...