Great tips as you can never be too careful when it comes to security in crypto land. I just revamped my security procedures yesterday and saved my public address and private keys for my ethereum wallet to two separate USB disks.
I'm also considering getting a Trezor but will do a bit more research on it first. The only thing that I haven't done yet is better protect my private keys stored on my laptop. I was a bit worried about leaving them on there but didn't want to get rid of them either. I like your idea about encrypting private keys on laptop. I think that just might solve my problem.
Also, I keep a dedicated journal where I have all crypto related passwords stored and it really helps to keep things organized. I just have to ensure to keep it in a safe place of course.