#4 is sort of what they did in California with electricity.
Removed controls on the production end, but kept the controls on consumers to keep electric prices low. Not surprising it blew up in their faces and shortages were the instant result.
Let gasoline and fuel prices rise naturally. Don't slam a huge tax on it. But as you say, do NOT artificially keep prices low.