That all sounds reasonable. I think you made a wise choice in upgrading. All of my criticisms are related to the video features, which don't really affect you very much.

Oh, and I think it's "pouring like an avalanche"