This is one long but very useful post.
I have a lot of reading and safety measures to take.

So far I have my wallet stored on off-line (never used) equipment and on usb.

Is that not safe enough?