I flew to Buffalo airport first, got a rental car, then drove to Niagara Falls to land in Canada. Only 1 to 1.5 hours drive. Super easy. The Canadian officers were nice and efficient.
Then I used my I-94 to drive back to US without any problems.