Have you considered doing a alignment with a Indy tuner ?
I find my tuner tends to dial things in a bit better.

Does the dealer do it in house or subs it