There is a simple answer to this – end them now! It is unlawful to take WFTC/DPTC into account after they no longer exist. It is also unlawful use notional WTC/CTC. Overpayment concerns are valid (although not all cases will end up with them) but are also irrelevant to your decision.
