I know it's all resolved now, but I just got to catch up on 7 pages here's my 2 cents.
1. If Okada comes to WWE he won't do NXT, but he WILL go to the PC to get ready for his debut. Learn the WWE ring, and get a crash course on the WWE presentation. Midcard guys probably debut in NXT but Okada is obviously not that. He's a fucking legend.
2. Do you announce his appearance or do a surprise? If he's in the Rumble it's a surprise but if you can get him for Mania I'd be announcing it beforehand. Hell I'd have him at Elimination Chamber if at all possible for his first appearance. I'd honestly not have him in the Rumble match cause he's not winning it.