Waverider Design Methods for Non-Conical Shock Geometries