The X wing is fine. It's just a touch too expensive. It's boring, but giving it a 2 point price reduction ala Chardaan Refit makes it exactly as expensive as it should be, applies to all X Wing ships and pilots, doesn't rely on astromechs or other slots or upgrades, and is balanced across the entire spectrum of ships and upgrades.
What's nice about a points reduction is that it would put the X midway between the cheaper A and Z which it really only adds +1 hull and red dice to, stats wise, and the B which currently offers a lot more than the X overall. It would be your mid point ship. Faster with a better dial than the B but with less 'tricks' and tougher and more shooty than the A or Z but without the As speed or the Zs cheapness.
Don't think FFG will do this outright, but there's sense to have the differentiation.