I have the same dilemma. One personal, one for university, one for commercial software. http://inessential.com/2019/02/13/two_factor_authentication_and_developer_ If you have a suggested solution, please let me know. Appreciate all the help I can get. Thanks.