Niagara on the Lake is definitely worth staying in - it's a gorgeous little town. Main Niagara is not worth staying in if you can avoid it, although if they still light up the falls, that's worth seeing. But the falls themselves. Well - when I went I expected it to be over-hyped and disappointing. It is hugely hyped - but I don't think you can actually over-hype something quite so impressive. I was stunned by the whole thing, including the Maid on the Mist which was something else altogether. The trip behind the falls in also highly impressive. And make sure you go to the top - when we went I found it staggering that you could (if you wanted) just step over a low fence and right over the falls! Over here, you'd not be allowed anywhere near.That is certainly the more preferential option to do Toronto on the way down. Will definitely look into Niagara -on-The-Lake, thank you
Enjoy. And enjoy the match too.