p.s. I'd swap your shifters/mech too - I've not looked at the prices but if it works out similar, go for X9 shifters and an X7 mech. In my experience the difference between X7 and X9 is greater with the shifters. Also it's a master/slave thing - the shifters control the mech so it's generally better to spend the money there.
One bike I have is X7 rear, X-Gen front and X7 shifters.
t'other is X9 rear, XT front and X9 shifters.
They both feel the same (my X7 is the old X9 so they are essentially identical). The SRAM X-Gen looks sturdier, but then it is conventional and the XT is top swing.
well i currently have an 11yr old alivio front mech and stx-rc rear mech and alivio shifters - all were oe spec on the bike 11yrs ago, as is the chain and cassette! time to uprade me thinks...