I am not sure but I think I saw 4 wrestlers in CMLL work as the Havana Brothers. Ricky, Rocky, Puma/Pinoy Boy, and somebody else.
I would use the X Cup as a tourny to promote new talent outside of TNA so there is no need to have Lynn, Sabin, Skipper, and Daniels again. Unless they work well with the other teams.
I would replace Nosawa with HEAT so all of the japanese wrestlers names could be in ALL CAPS.