I am curious if you've tried to play with the micro-adjustment function and what whas the result. Common sense says that it should resolve any issues. I am asking, because my bike is 11-speed drivetrain, and I've found a good deal for the set of Rival AXS shifters, calipers and RD. So, for the reasonable price I would be able to upgrade electronic shifting and hydraulic brakes. My goal is to replace the rest of the drivetrain to 12-speed (1X crankset and cassette), but because of the cost, this part of the upgrade has to wait a bit. I am not sure how long it will take me to gain some extra money for the missing parts, so I'm afraid that I could miss this deal.