I drained most of the fluid from mine too. A little more effort, but not annoying. I didn't remember my old Golf II being this hard though, must be middle age catching up with me!
If you pull the p/s pump, do you block the rack ports? Or is everyone leaving them open? I'd love to pull that plumbing out completely, I was thinking block-off plate...or some big stubby bolts.