I bought both too... cut out the innards of the x-wing , scratchbuilt new landing gear, scratchbuilt the cockpit, and added canards to the nose:
(yeah, I know...it doesn't hold up to the film version...I built the one described in the original script, wheels, etc....so I call this one a T-65 G )
http://members.cox.net/ewaldbros/xwing.JPG
http://www.ewaldbros.com