Like virtually all credits, you must use them in consecutive years. Since you won't know the carryover amount, wait to file 2017 until you have at least prepared the 2016 amended return. You don't have to wait until the amended return is filed, you just need the carryover amount from preparing it.
