I'd still advise you to buy your rebuild parts from TEP. Bring those to your "local guy" or have him check out what they recommend to use.

Clicking on acceleration sounds like a cv shaft. Many suggest to pull OEM ones from the yard.