For those still trying to use the older Device-Based Activation method with opptransition.exe, which according to Microsoft should still work, but for us had become very unreliable, here is a new version of opptransition.exe they shared with me. This has worked much better for us (although still not quite 100%):
https://1drv.ms/u/s!Ap1UEodVD0yRj4Ne252E5UYor-3ZOw?e=pAhd2V