I like your mods.
I have an X2 as well and had all sorts of issues with it out of the box in terms of rigidity and too much play on the axis.
I haven't upgraded the drive yet as the gear drive has been ok for me so far though very noisy.
I converted the cheap threaded rod axis to ball rod...