Definitely keep the majority of your account in SP or Savings. That makes stealing the money before you can recover your account much more difficult. Then don't use your master key unless absolutely necessary. Thanks for the post and suggestions. This should be discussed, and hopefully your story will help others avoid the same fate.

P.S. You reminded me to change some SBD to Savings too! /thank