Interesting that you can drop it off the Apple Store.
I think I am going to hold of buying the 2016 now and wait for the Mid update or Late update with the problems solved.
Are you still in the return period ? Maybe you can hold on to your old machine now and wait for couple months for the update ?