Sounds like you have the wrong ratio master cylinder too if it feels wooden...if its a single disc you only need a 16mm, but it sounds like you have a 19x20...... if you have a twin disc set up I'd go for a 19x18.......
Those calipers were v poor when new.If your wanting to keep the original front end I would get a plate made up and fit a more modern caliper.