I've been over 3 times and each time I got my paperwork done at the border the afternoon before the trip started. It was very quick and painless. All 3 times I crossed from Mission over the Anzalduas border station so I can only speak to that location. Once I did have a bit of a wait coming back to Mission after I got my paperwork done.
Sounds like the way to do it. Thanks for the input.