Yes. To shut off all power (pool, hot tub, house) would require shutting off both breakers.
What you describe is what I am also thinking. Change out the subpanel in the garage with one that has a main breaker and then follow NEC 705.12(B).
The solar company also stated that the city is...