You should use cylindrical coordinates to define the shape of the glass. It will probably make the integration easier.

Just looking at wine glasses it looks like it takes the shape of an arch or a parabola, they are quite similar. For information on the equations for arches look at Catenary - Wikipedia, the free encyclopedia a parabola would be easier but this might impress someone looking at your project