If the X Wing should remain a generalist, I would argue that it needs to drop in points. An X-Wing specific modification card would work for this and might include something like:
'blah blah blah fluffy name' : -3 points.This upgrade card also uses your Astromech and Torpedo slot.
This would allow us to field a combination of 5 rookie/red squadron pilots. Which seems pretty awesome.
I don't know if that's the way I'd go, though. Personally, I'd rather see the Torpedo slot get hijacked for other stuff:
-X Wing only Upgrade Card (Torpedo slot; 1 point): Primary weapon shots fired at range 3 are resolved as if they were secondary weapons. (ie, not +1 agi die for defender). This would favor the X Wing flying slow and staying at range, and seems to fluffy-justify the 4 x-wing lasers converging on target at max range.
or
-X Wing only Upgrade Card (Torpedo slot; 1 point): Primary weapon shots fired at range 2 are resolved as if they were fired at range 1 (+1 red die). This would favor the X Wing being a mid-range all around superiority fighter, and seems to fluffy-justify the 4 x wing lasers converging on target (slightly different interpretation from above).
then there are other things you can do:
-X Wing only Upgrade Card (Torpedo slot; 0 or 1 points): If you have no secondary weapons equipped, add hard '1' turns to your maneuver dial. Additionally , all 2 speed maneuvers are green.