Choi makes long-awaited return at ISPS HANDA New Zealand Open