The blockchain grows about 50G per year, so you're good for another 10 years. 1T sounds like the right choice.
I agree. SSDs have a sweet spot and 1T is about where it is right now unless you have specific needs. I've never found upgrading to be much of a pain, particularly for data drives. In fact, keeping system drives as small as possible helps keep upgrades snappy.