Thats right.
Just introduce 10GB blocks and call it a night. Problem solved.
Let's just hope people who can actually run a node don't get the bright idea to charge subscription fees to let your SPV wallet connect to them.
This is inevitable. It cost time and money to run a node which serves headers and Merke-branch proofs to SPV clients. Eventually, businesses will charge for this service, perhaps using payment channels. I'd suspect the cost would be well under $1 per month, as it would be a high-competition / low-margin type business.
An income stream for non-mining nodes would be a positive development, as it means we're not relying on altruism. Do you disagree?