Try and get your passport renewed asap. Life is always easier when you have that as your ID.
Pipe I feel sorry for you bro, I am in the same boat as you when I cross the border. I always get a hard time
I have to go 3 hours early now when flying to the US. I have to give myself an extra hour minimum to deal with customs. Such a pain in the ass....
DH