BaP - upgraded X Factors nearly impossible to keep

My player is maxed out on acceleration and agility with every related +perk I could find but he loses Elite Edges and Wheels (upgraded once) if his energy drops below Peak. Acceleration/Agility traits are maxed out and I can't consistently hit 90? I only have the first 2 passing trait upgrades and yet Passing is 99. And I'm a sniper, not a playmaker. 

It's super annoying to have to top up his energy and re-enable these X-Factors every single game. Please - at least auto-enable the upgraded X-Factors when I hit Peak. 

And if we max out a trait, it should be pretty close to 99, especially when the traits that aren't even close to maxed out are 99. 

Thank you.