QA1 Handling kit questions ???

Just looking to improve handling and braking. The old suspension needs rebuilt and has small ball joints etc. Looking to convert to disc brakes with the big ball joints and add the tubular adjustable upper control arms while I'm at it. Noticed the handling kit included all new components as well as a sway bar which I'd like to add. Haven't decided just doing some research (and tearing the car apart)