Border control should not issue TN to you any more. Using TN is better then AP, as you don't have to stop for new I94 on entering to US.