A 529 isn't that great for school you plan to pay for before the middle of next year. It's only the growth that is tax-free, and over such a short timeline that won't amount to much. Perhaps your state offers a tax credit to make it more worthwhile, but otherwise I personally wouldn't bother. However you may wish to shift some of your investments to bonds to minimize risk of volatility over the next year when you'll want to pay for the schooling.
Looks like the Lifetime Learning Credit starts phasing out at $55k of MAGI for single filers. That phaseout can act as an extra 20% tax on income between $55k and $65k, assuming you have enough expenses ($10k) to qualify for the maximum credit. If you think you have any chance of going over $55k, consider making traditional IRA contributions instead of Roth, at least enough to keep you below that line.