The Z-95 basically looks a lot like that tho Paul so the confusion is understandable. It just doesn't have "S-Foils" swing-wings... The Z-95 is based on the concepts for the X-Wing though, which feature the bulky(ier) engines and such. There's a good Titanium Z-95, and Clone Wars had a different model of Z-95 featured in it as well. I'm hoping to see some of those in Rebels, repurposed.
I'm just now home and anxious to examine the evolution of the X-Wing in some detail.
I love this thing. I know the pilot sure looked to have a new style helmet on.