Yeah RS T brakes should do the job

BTW, I fitted braided brake lines to my old S2 and they made a noticeable difference, so for the sake of £40 or whatever they are, it'#s well worth it