Does the two-year limitation on making changes apply to the General Assembly?

No. The General Assembly may amend a city's charter at any time and in any way that it wishes to.