There may be a way around your situation. According to the IRS: "If contributions to your Roth IRA for a year were more than the limit, you can apply the excess contribution in one year to a later year if the contributions for that later year are less than the maximum allowed for that year. Under this rule, you can apply your excess 2015 contribution to 2016 without penalty. So recalculate your maximum 2016 contribution, then withdraw enough of your 2016 contribution to bring yourself within the limit, taking into account the excess from 2015.
