Front End Rattling - Clicking - Shimmy

I have a 1991 Passat. There is a rattling noise (loud clicking) along with a shimmy. I have already replaced one of the CV joints (bearing on the drivers side), along with an engine mount. I drove the car for three days seemed better then low and behold the exact same problem has come back. There seems to be less noise and shimmy when the accelerator is depressed and gets worse when I start to brake. The car is with the mechanic who did the initial repairs he's scratching his head. He tells me that as of now there doesn't seem to be a noise or shimmy that he is experiencing. I'm loosing my mind please help.