Master cylinder conversion

Hey I have a mk1 golf running a 20vt with g60 corrodo 280 front brakes and mk2 golf rear disc conversion.

I am going to basically ditch the servo and just run a master cylinder straight from the firewall in front of the pedal like old mk1 golfs . 

Shall I just opt for the early 70's mk1 golfs non servo 17mm master cylinder or shall I go for something much bigger ie a 23 mm cupra one . Basically who's gone back to non servo ?I do not want a bias pedal box or servo / remote servo . I can weld and fairly good at fabricating anything just wanting some advice on master cyclinder choice and fitment . Many thanks . 

This car is no longer my daily commute and is going to be turned into a Sunday / track car so I'm away of the wooden brake effect .