I guess then file a change of status separately with the current I-20.
Also, please consult a lawyer as well; I am not a expert; all my info are based of personal experience and reading/hearing knowledge.

As far as you know you have maintain status and have a valid OPT I-20, you can continue to work.