So decided to have a look why the damn shocks were clunking around... And change the brakes.
So it turns out in my frantic hurry the last time I did the springs I put them in upside down... :-/ oops lol...
And I slapped in some spare shocks I had that felt better than what I was pulling out.
So then the brakes, whoever did them last out in the wrong ones because they were bigger than the rotor itself... I just don't know why I didn't notice it before.
Now the car feels way smoother on brakes and the car has way better feel on the road.
A small pic of the difference between the old and the new pad.