Surface from Grid Problems

Hi,

I have been working on an elevation study for a project in grasshopper.  The basic premise is that this surface is being controled by a sine wave to determine the width of the windows, a ripple pattern to determine main structural elements and a tan wave to detemine changes in depth. 

My problem occured when I tried to place a surface from points.  I was able to create a delany mesh that achieved the look but did not offer me the ability to punch windows.  I believe I need to order my points in some fashion but am not sure if this is right or the process to go about that.  I have attached both the rhino and grasshopper file.  Thank you very much in advance.