This analysis shows the Solo 401K is the best overall Retirement Plan option for Independent Contractors and the Self-Employed. Where it lags on cost and administration would only be due to expense and effort to take full advantage of its significant flexibility.
Investing before taxes is great, but not necessarily optimal in each situation, and ideally you can reduce your debt burden and increase your savings rate to the point where investment both before taxes (in your 401k) and after taxes is a possibility.
In order to break the habit, a change in mindset is required, employing self-discipline and delaying gratification to make decisions based on economics, not emotions.
When moving money be cautious as mistakes can be costly in terms of taxes and penalties. Being organized in your financial planning today is likely the best scenario for your future, and I would encourage you to consult a professional.
A comprehensive Financial Plan can address any concerns and answer your questions about your financial future - and ultimately set your mind at ease.
If your long-term strategy is to reduce debt, I would encourage you to make sure savings are on track (emergency fund, retirement, college, etc.) and other debts have been paid off (credit cards, student loans, automobiles, etc.) before considering reducing your mortgage debt.
