Recharacterize for 2015.
If your income comes in above the Roth limit in future years, do a backdoor Roth IRA.
Finally, the limits are against MAGI, not AGI. A few other details, but basically you can't use the tIRA deduction itself to qualify to deduct the tIRA contribution. Ways to reduce MAGI include maxing 401K/403B/457B, HSA, the variety of FSAs, paying health and dental premiums through work. Self employed? Open a SoloK if you make under about $250K or SEP IRA if you make over $250K.
Basically, your salary can be pretty far above the limit and your MAGI still under it. Even if you are over the limit, you can do a backdoor Roth IRA.
And even if the backdoor gets outlawed, you're making pretty ridiculous money, I think you'll be OK.