The obvious solution is #1. Tip credits were a greedy and completely unnecessary policy from the start that should never have made it into law. Removing them again will undercut one of the main reasons everyone still feels obligated to tip at restaurants.