I went over to the dark side and installed Windows 10. That took 1 false start and about 2 hours with the first really competent Microsoft engineer I've found at the controls, but eventually it completed, and I have to admit it's working well. OneDrive works, it seems faster than 7 was, and other than a steep relearn-everything-you-knew-about-adminstering-Windows curve, I'm happy with it.