> My plan at this point is to switch all our savings to the employer accounts and completely stop contributing to the trading account, just leaving it there until retirement, unless one day we make enough to max out our annual contributions. Thoughts?

Sounds like a good plan. You can in effect shovel money from current savings to tax-deferred retirement accounts by maxing your current year contributions and using your existing savings to cover any budget shortfall. If your employer offers a post-tax plan that allows for in-service Roth rollovers, you can do a mega backdoor Roth IRA and convert up to 66,000 this year.