904 Transmissions Drying Up

I posted earlier about getting my 904 rebuilt. I just spoke to John from CRT and he informed me he's no longer building automatic 904's at least for the foreseeable future, only racing stuff. So then I tried Hughes Performance, they seem to have ended rebuilding them as well! So I know not to go with TCI. Has anyone used Performance Automatic?

I had my 5.9 ready to go in when my 904 started making odd whining noises from the front planetary set, so I considered rebuilding it.
I can build them myself, but after looking up all the related parts I found it would cost almost the same to replace the 904 with a 42RH overdrive.
Plenty of those still around.