This can probably move threads, but personally, if I were the city, once the plaza has returned some of its recent expenditure, I'd:
Purchase back the Old City Hall, as Equilibria has suggested, and move City Council and Mayor offices there
Develop a new site plan, partnering with GSA (or...