-EDIT-
I still have the deleted wallet.dat available in my recycle bin
\O/
Pheww!!
So, first step here: make a backup copy of both wallets (saved with separate names to ensure they are identifiable, e.g., wallet-encrypted.dat wallet-unencrypted.dat )
If you would prefer not to deal with the technical steps of exporting and then importing keys, simply just use your wallet-encrypted.dat when you receive funds at an old address, but use the unencrypted wallet for everything else.
And change any payout addresses to use an address from the new wallet.