Mayor battles state lawmakers, chamber over zoning overhaul