Agree. Removing the cap on SS income contributions is a better way.
The problem with contributing general funds is that then they could take from it for general funds. There is a reason why it's separate.
Most people get confused by how SS works and so we should be average when communicating about it.