I can confirm that the unlimited upgrade option is still working. I just went through the whole process. My confirmation email says I still have unlimited data.
I hopefully saved $400. If it doesn't work when I get it, I'll just return it to the local Verizon store and buy it outright, as I planned all along.
I've got a bad feeling about this.