Are your wheels standard? You mentioned putting later model X5 wheels on. Did you use (do you use) hub-centric rings? If not, then you can get shimmy at high speed, as the wheels are not centred no the hub correctly without hub-centric rings.
These...
https://www.ecstuning.com/b-ecs-part...set/747260~kt/