I would keep your BMW and go find yourself a nice 964.
I think in a year or two when the new 8er comes out... your car will start to rise in price. And it will be even harder to find a good clean example like your current 850csi with the six speed manual and the ///M v12 engine is quite rare. You really ought to hang onto it.
Dack