You really should be fine coming in as a visitor with just your Canadian passport (although consul with an attorney if you're really concerned) and the strategy could be to do this until you get some pushback.