Transition from Clerestory Roof to Shed Roof?

[PugPappa]

The post regarding building a Clerestory roof was quite enlightening and got me past that road block. Now I'm trying to incorporate that into the remainder of the roof that is a shed design. I was able to hack something by using an invisible wall to 'firewall' the shed roof from the Clerestory to keep the Clerestory from suddenly becoming some horrible Clerestory/gable construct. When I shove the separately drawn shed section to the other, the roof overhang intersects with the adjoining gable end wall, messing up the geometry and other stuff I'm sure.

Before:

After: 3D:

Hack: 3D:

Any clues or guidance would be appreciated.

I'm using HD Architectural 2014.