You should get a SENTRI pass in order to cross back into the USA easily. Without a SENTRI pass it takes hours cross the border.
Do you have one?