I'm not aware of the 6040 dimensions but are you using the rubber grommets?
Adding a spacer might straighten it out for you.
Same dimension as the similar savox. No grommets. Spacer made it better but I need 6-8mm to make it straight. Seems like a lot!
Thank you