I have been checking the skills and based on Campitor's post and comparing them from the "Skill Bundle"
They are in line with each other. Ignition Break for example, the AoE and ATK% on it is based on the final RK rework and not on the initial. GX skills are the same with the only difference is Cross Impact is only half crit chance and damage. The rest of the mechanics are based on the final GX rework skills instead of the initial.
The final rework on Royal Guard seemed to not made it though. The final rework on RG includes Cannon Spear being 7x7 instead of 5x5, full crit chance, damage and having a shorter 1.7sec cooldown.
I think the final version of Cannon Spear comes after 4th classes.