I think I made a major mistake by switching driver’s licenses

Why would you be screwed? You don’t have to change your license and registration when you PCS and are AD. You can hold previous states that you have lived in.

Now, I have no idea how your state’s laws are regarding renewal and driving on an expired license.