Not sure if the servo is the same or not, i would of thought it would be the same, the RS1600i brake linkage is notorious for being very poor though, the setup on other mk3's is far superior.
You can get some pattern roll bar clamps from many places although i cant name any psecific names, they are a lot stronger aswell being machined and not cast.