I thought the Spanish building one did count upgrades? I've seen the AI get it before and they didn't have 30 different buildings (not including upgrades).

There are other bugged goals too. Like the trade one for the Italians and the crusade to Antioch for the Aragonese (VI only)