Honeybee

I am attempting to incorporate several polysurface honeybee zones with several zones derived from surfaces.  When  I feed everything together in the solve adjacencies component I get the "number of windows doesn't match error".  Is there an easier way to resolve this besides the workaround in Chris Mackey's Honeybee tutorial.  I know that I can resolve it with that method but as I have several zones I was curious if there was an easier way.

I have attached my working file.

Thanks,

Chris