smp 2500 8500

Hi there, I am looking to purchase a new SMP, and have been reading about problems with the 2500, so my question is to buy one now, or wait till it gets the 8500 movement. I have asked my AD, and their watch buyer has said that it is likely to be nearly two years or more till the SMP with 8500...