What I keep seeing
People compare a Canada-bound wait with a Buffalo-bound wait as if they were one line. They are not. CBP and CBSA publish different directions, and the number can change before you reach the bridge.
What should exist
I would keep a small border card with direction, vehicle type, chosen crossing, current wait, alternate crossing, documents, and time checked. The Peace Bridge Authority can supply crossing information. The agency pages supply the live wait. A navigation app is not a border rulebook.
What a Buffalo person can do today
Check the official wait page for your direction. Check the other agency only when you need the return direction. Confirm the crossing in your navigation app before the bridge approach. Carry the documents that fit your situation and confirm requirements with the relevant agency. Border officers decide admission.
Official sources