I believe that going and coming back across the border by bus is most reliable way to ensure your passport will be checked and stamped properly.