you can fax in the form to ATF lakehunter and first time might be 6 weeks or so but once your approved once then turn around is usually couple weeks. Give them a fax number and they'll fax back your documents for crossing into US. No charge and nice and easy.
Coming to Canada won't have any change with the lg rgistry abolished. Registration was for Canadian citizens so US ones visiting still have same thing to do.