Caddy mk1 brake upgrade

Looking for upgrades that will enable my mk1 caddy to have good brakes?
Open to any ideas and suggestions to do..
rear conversion to discs
better front brakes
think the caddy has already had a larger servo installed when gtd engine fitted 

Rear discs are more for looks/maintenance than improving the brakes really. Various front modifications available, depending how much you want to spend and what size wheels you have.  Worth looking at the Vauxhall parts conversion if don't want to spend a lot.