Ok kind of forgot to update with the ball joint. I got it sorted, purchased just the ball joint seperately from a Polish dealer on ebay and came faster than i thought it would. No more knocking!
Now, Friday i had a delivery from Ktec Racing
Full Akrapovic system. Got it booked in for 22nd...