Then I think you are OK, Ted. Unless it's a local code or something. I just finished a project where we had a fire pump room that also had the incoming water service riser, building management panel, fire alarm panel and various other foreign systems.
Not sure why the local AHJ is requiring the dedicated room. Can you ask him / her to provide a code reference ?