Hi, before splashing out on another servo and master cylinder, check you vacuum hose for leaks, I've found this has been the cause of many problems with poor braking.... and it's worth flushing your brake lines through with new fluid, hope this helps....
good luck John.