Don't forget that once you re-qualify your extra points will rollover (up to a cap you don't have to worry about) so not be lost. I'd go 30 May if you need these points to re-qualify but agree talking to NZ might help if 31 May suits you better, as NZ could give you the extra day.