From what I've read It seems that Koyo is the one to go with.
I also have some clicking on the driver side and plan on swapping out my birfs hoping it will help, are there any exta parts necessary to swap my driver side and passenger side?
Also as far as piecing a kit together I've found this...