Consultation also proposes new tax plan to replace controversial windfall tax from 2030