I agree with you overall, but I think you are ignoring that Trump loves to set himself on fire when someone pokes him with a stick. The question becomes whether this particular poking creates the same 2016 synergy by super energizing his base and getting enough moderates to come over as well.

It's like chaos theory, where is Dr. Ian Malcolm these days.