Not really my area of expertise, but if you're going to make more self employed (after all the fun self employment taxes, any loss of benefits, fees to register a company, more complicated tax reporting, etc.) and you don't mind the risk and extra work that comes with not just being somebody's employee, then it seems that's the way to go even without the tax shelter. If you're going to start a business, it's probably a good idea to hire a little time from a professional (attorney?, tax adviser?) that deals with such things regularly and will be able to guide you. It's my understanding that the good ones will more than pay for themselves by pointing out the easy way to do things and preventing costly mis-steps.
Putting $59k away tax free is huge, but do remember that Uncle Sam will get his pound of flesh eventually and that you're going to still have to pay normal income taxes on withdrawals at retirement time. There are ways to soften this, like Roth conversions in low income years during RE. If the excess of the $59k over what you can shelter now will come from the higher 25% bracket, you should be better off this way from a tax perspective. If it's out of the 15% bracket, you're probably slightly better off unless you grow a huge stash and required minimum distributions push you into a higher tax bracket in retirement.