Yes Niagara Falls is and always HAS been the best place to hand in your waiver anyways. 90% of my clients go there, including people who live in Toronto (despite the Airport) and Windsor (despite Detroit)
Sundays 5-9 pm.
There is no lineup, no waiting, and they don't allow trucks so you are never stuck in a line.
Easily the best location in Ontario