How many nights is your trip? If it's for the weekend and you do rent a car at BUF which I think would be your best bet have you considered driving to Toronto and staying a night there. Shameless plug for my hometown but I think you would enjoy it.

Niagara Falls is OK for a night and a couple of days but I personally wouldn't stay there for longer.