You're light years ahead of most people your age.

Sounds like you're following Dave Ramsey's scheme more or less.

I'd max my pre-tax investment into 401k, even after matching stops, up to the $18,000 max that the government allows.