Hi @ian_ratner ,
I understand that you want to give users the flexibility to switch between social and database logins. I believe that the user account linking feature can fulfill your request. By enabling the user account linking extension, if the user already has a username/password account, when they click on the social login, they will be prompted with the option to link to their existing database connection, and vise versa.
This FAQ explains the details. Hope it helps!