Dont surrender the based on licence, just nip to an AME and get a student licence issued. The commercial can be done with a FAA class 3, the class 2 is only needed to exercise the privileges.
Then make the necessary endorsements on the student certificate and log book. The cost $80, no big deal in the context of everything and solves the problem.