@Kenny *********
you shouldn't feel you're rocking the boat by making immigration officers actually follow the rules their government agency wrote :O I mean they're their rules and by pointing them out to them you're not over stepping anything.
I think what you ran into 2 years ago was the fact that you needed to have filed a TM30 (which has been on the books as a real rule for 40 odd years but only started being enforced a couple years ago).
Good luck, take care, stay safe