I think the only way to retain your characters, as well as both the physical and in-game bonuses, would be to pre-order the digital CE from steam. (Which shows up on steam right now)

Buying the base game again would only get you a new account.