This may not be possible with your setup but a lot of people end up setting up some type of track for the wheels to run in. It helps stabilize the x drift when the machine is moving longer stretches in Y. My version is in the link below, along with my solution to the squaring.