So after talking to an online TurboTax Live expert (who was pretty green, but willing to try to track down the answer), the best guess was, as you suggested, that you simply add $1K to your contribution amount if you want to include the catch-up contribution--assuming you qualify. I think TurboTax can do a better job on this, to be honest.
