Heres the dirty stuff, im rebuilding the roof and windows as one piece against the existing stuff, then i will estract the different bits out of it and stich back onto the original ( if theres anything left of it) that way i get continuity across the whole shape.