Anyone that pays over MSRP I do not feel bad for at all, history shows that is a very foolish thing to do, if no one did it dealers couldn't attach ADM's, but too many people have to be first in line.
I agree about the price increase, they might add $500-1000, but I can not see more then that, the demand for the car doesn't come close to warrant it, they are sitting on lots all over the place. In New England it is very easy to find $4K off, after this 2021 news I am sure that will be even more.
My 2 cents is wait, they are not selling nearly as fast as they expected, in the Northeast over $4K off isn't hard to find. No matter what you save on the 2020 you will absolutely lose that plus some on resale value. No offense to the 2020 owners but down the road no one will want a 2020 used...