I spoke with the AHJ today. He agreed that the disconnect switches are a good idea. He said that he had discussed it with the fire marshall and that was why the fire marshall backed off on it.
He wouldn't commit as to whether they are code required or not. He said that the next time it comes up we will dig into the code and come to a conclusion.
GJ
