Well, I found another way to do it, and now can confirm it works all the way. Going back to Sketchup, I experimented adding lines that I assumed would join certain faces. Since I had that line joining the top windows, I drew some lines to split up the faces in a different place, in an attempt to make Pepakura interpret them differently. This is what I came up with.
