Chad,
Yes, the threads are what seemed to wear mostly and those parts didn't come with a 'rebuild' kit. ;-(
I tried your general approach initially but with the C-Series that I was using then. But I could never get the darn thing really clean inside. This was with the cheap guns that NIC...