Your best bet for the front would be to fit a porsche 944 disc brake set up.
Doing this would mean the fronts would tuck in better and also improved braking. I'm in the process of doing mine and managed to get the set up plus fitting kit for £300 which is a dam site cheaper than a csp kit.
Not sure if these are still for sale but may be worth asking.