I prefer the Flag Day approach, precisely because of the toxic political environment you're referring to (or at least I'm calling it toxic). But it's arguably UASF in a different guise, although "user activated" is a little of a misnomer for Flag Day activation.