It's crazy that people argue what is being scanned, but the very fact that it will take place at all. Imagine a landlord coming to your place and looking around for drugs. This is insane violation of privacy regardless of intent.
When Apple will start analyzing pictures on iphones and not in the cloud, then your substitution will become correct.