No. My argument is exactly that you should support adopting dogs while better enforcing laws against puppy mills.

Those edge cases that you mentioned are the ones that shelters should be there for (those revoked adult dogs usually didn’t come from proper breeders).