Bottom line: the ONLY way to figure this out is to email, call or visit your local DMV, explain your situation and have *them* tell you what to do. Document what they tell you (get names/phone numbers).
Good advice from John.
Also, say yes-sir/yes-ma'am regularly, and thank each person for their advice/assistance (remember their names, and use their names, Mr. ### and/or Ms. ###).