When you return in March just rebook your flight one day early on Sunday and you will not have to overnight in Toronto. That solves your problem.