Having a bad run with '94 323M 1.8L MPI

I recently bought a '94 mazda 323 with the 1.8 DOHC MPI engine. I was very impressed with the willingness of the engine. The vehicle had the CV joints replaced by the dealer I bought it from and my problems started. What started as a small clicking noise in the right CV joint has become a major issue with the front end.

I will abreviate the story:

1) Dealer supposedly replaced right CV joint and charged me $200 'parts only'
2) Turns out dealer replaced left CV joint, so dealer replaced right one (Left one was fine to begin with)
3) Dealer fitted wrong CV joint to axle and joint stripped spline on Axle and had to be replaced with correct part. Dealer claimed the axle was fine even with the damage after a clean up with a file etc.
4) Both CV joints are now making a funny clicking noise, steering is lost it's previous 'direct' feel, the suspension is squeeking. heavy pressure to the breaks makes the whole front end 'Clunk' and shift.
5) Took the car to another mechanic for a service and to try and get the situation fixed. They found some loose bolts etc and made the clunking alot better but it is still there.
6) Car has lost significant performance after service. I estimate 10-20%. Previously the car had a nice pick up in the midrange (Aprox 4K RPM) which it now does not have.

I have owned many cars and have never had issues like this before.

Any advice would be appreciated.

Nazgul.