Long story short, she got arrested and more charges.

Like?

they were waiting for a judge to sign off on a warrant but were able to talk her into coming out before the warrant came through.

And how does this support your argument? She was talked out of the protection of her home.

was hiding in a closet inside the house. They didn't have a warrant, but they did have probable cause to enter the place, so long story short he got arrested even with the hiding in the closet part.

Again.... If it goes to court and the lawyers can defend the officers reasoning for probable cause then they throw out the case. If you volunteer yourself they don't have to establish a legitimate probable cause.

The thing is that about 90% of the situations where they're coming to the door and are planning to arrest you will fall into one or the other of those categories.

Not at all.... They need to be able to provide evidence for their breach of your rights in court. Will it help you beat the ride, no. But it very well may help you beat the case, which is the important bit.