Keep the Roth you started and just let it grow. Finish funding the 401(k)-type plan to the max. Consider funding a non-deductible IRA if your income is such that you cannot contribute to a deductible IRA or Roth IRA. Fund your taxable account with any money left.

