It sounds like the valve in the pump is sticking, try some WYNNS power steering stop leak, I use this myself in many auto boxes and it works ace, about £9.
Rack is easy/ish diy change buy a haynes manual and save a shed load of cash.
tabetha