I went out for a ride this weekend after the re calibration.
Still not right, BUT when i changed modes it did feel different.
The suspension although still banging and hard is less in Rain mode than it is in Dynamic for instance.
As
@anotherone mentioned i am leaning more towards a shaft issue.
I have booked in with Williams BMW Manchester for them to look at it, i might as well ask for a full service including the final drive too.
I will explain the issues to the mechanic and await his opinion.