The solution is obvious (Score 1)

This seems so simple that I am sure someone has already suggested it (and I apologize if someone has). Simply require that Mass Marketers include an identifier (e.g. "UNSOLICITED") in the Subject Line of the email. Then people who don't want to receive the Junk can filter it out. Those who do want it can still receive it.