Divvy+Stay is the magic combo for me: https://cordlessdog.com/stay/ (moves windows back to my external monitor when I plug it in)