You fudged up calculating . It should be .
Also, IMO, calculating the marginal of X is just asking for a stupid mistake. Calculate all the expectations from the joint, and integrate over x first so that you don't have the additive terms. It doesn't matter for the end result, but its easier and you can do it in your head.