McGregor set for UFC return in January