I would fully be in favor of the two suggestions you offer. They should have been put in law years ago.
I try to come up with ideas that are easy to defend, compared to clueless Republicans that constantly claim they are for stuff and never pass it into law and dont even really argue for it. When they do their arguments are lame and never convince anyone.
The one thing I will say about Democrats : they know how to fight by poll testing arguments and throwing them at Republicans like target practice.
"Tax the millionares to keep you from paying payroll taxes". Very simple message.