Neutron star collapse and gravitational waves with a non-convex equation of state