The first thing would be to change the upper control arms to the tubular. They are longer than the stock ones and can correct the bump steer. Then get a good alignment, 0 camber, as much as possible caster (3-5) and 1/16 inch toe in. Make sure they do a 4 wheel alignment and if the rear axle isn't square loosen the u bolts and give it a tweek. Expect to pay more for this kind of job and ask if they will do it first. I've seen cars pick up as much as 3 tenths if they were really off.
