Still wrestling suspension. Correct upper arms arrived and have been swapped out. Next challenge is the tie rod ends, the lock nuts are frozen, I have to replace the inner tie rods anyway so will concentrate on getting those out then attack the outer ones. I really only need to liberate the plastic boot as everything else will be new. Decided against replacing the shocks, its an easy job and can be done later.