I think what you will need to do there is use an independent roof plane to create your wall cap and then a little bit of manual manipulation of the wall polyline.