Not a hard rule, but when mapping similar school / hotel / factory complexes, I prefer to put tags on the main building, if one can be identified, rather than the whole plot. This guarantees that the tags will be rendered (since building is practically the feature tag). As a bonus, it will help routers to guide potential visitors close to the main building rather than to a semi-random point near the complex, which may be hundreds of meters away from the entrance.

That being said, before your recent edits there already was an office=government point placed within the main building outline. You may wish to merge the tags to one feature (point, building or plot), whichever you prefer.