WTB: Suspension 07/08 3G TL-S 6sp

I am looking to replace the suspension on a 07 TL-S 6sp (rear left shock makes a thud sound and feels unstable on spirited driving or uneven roads).
My options are Type-S ,A-Spec or / Eibach springs with Type S or A-Spec shocks.

Thanks