Magnetohydrodynamic Wave Mode Identification in Circular and Elliptical Sunspot Umbrae: Evidence for High-order Modes