Brake Advice

Hey All,
 
So having a few issues with my brakes in my 1990 SW20 that I am trying to sort out. I am not very mechanically minded but I'm getting there so please bear with me.
 
I have an issue with the ABS that when I start the car, and take my foot off the clutch whilst in gear for the first time, I get what sounds like a pump noise whurr for about a second but pretty loud that I can hear in the cabin. Now this same noise happens when I hit ABS when emergency braking. I also feel that my ABS is kicking in well before I am going to lock up. So I think my ABS brake master cyclinder pump is gone. This is problem no. 1. 
 
Problem 2. My mechanic has told me that the rear callipers are gone in. They have been reconditioned once and now won't align correctly without one side touching when trying to get my handbrake to pull up tighter. I have replaced the cable for the handbrake as well.
 
So my thoughts are, I have just replaced the rotors so I don't think I am ready to fork out again for a bigger brake setup but wanted to know what I should be looking out to buy and what parts are swappable between the first gen SW20 and the later Gen. I am thinking of replacing the following:
 
Brake Master Booster
ABS brake master cyclinder pump
Brake lines
Rear callipers and pads
Front Callipers and Pads.
 
Would this be all I need and what should I be looking for. It is just a weekend fun car with the odd (happy lap) track day.
 
Thanks for you help in advance!

Re ABS whirring noise? This is what I have been told anyway:
Every time you start up and the vehicle starts to move the system reads wheel speed sensors and performs a self test to make sure system is functioning properly.
Part of the self test is to run the pump, and that's what you hear. My car does it too.
 
Fix what you have, rather than looking at later model stuff IMO.
Early small brakes are more than adequate for an NA if properly maintained.
As trackmr2 says, a GOOD mechanic should be able to quickly sort everything out for you
Caliper rebuilding is very straight forward and simple. Who did it for you last time?
 

The full late model caliper would be a decent upgrade that could be had for not much more than refreshing your existing early model set.
 
If you're going to get new discs anyway, there's no incremental cost there, and if you're going to rebuild the existing calipers again no incremental cost there.
 
You'd really just be paying extra for a Master cylinder/booster and the calipers and lines. PM me if you're interested, this is something we could get from japan for you.

No they do not.