I'd stay away from the S2 'box, the casting is missing a piece needed to fit to the mk5 front gearbox mount so it doesn't just bolt in, I had to adapt the mount using bits from an S2 cradle to get it in my mk5.
Why don't you just get a quaife lsd if it's only the diff causing the problems?
MazakMan