Designer intent would be useful.
When I played this earlier this year we went with option 2. Here is why:
G5.1 Whenever PTO Terrain (G.1) is in effect, each wooden Single Story House (B23.21) whose hex contains ≥ two separate buildings, but no partial building depiction, becomes a hut. Except...