Out of curiosity what are you moving to? Ended up moving to gsuite because it was relatively stable some years ago until the domains thing but hasn't boiled over into a problem I needed to deal with imminently.