Very dangerous ground in my opinion to drop them both at once and try to figure out which changes are having which impact.

Exactly. And if earlier Hard Forks are any indication, very hard to get such implementation reversed once it’s in place.