Definitely switch to traditional contributions, no more Roth's please. (I am a CPA). Lower your AGI, also you can contribute on behalf of your wife, a spousal IRA, $5500 per year, do this all pre tax, it's much easier to fund and your net will be higher in early retirement, than a Roth.
"Your best Roth is simply to invest in taxable accounts and harvest gains at 0%" (source: myself)