To report back, I think I got super lucky. It took just 10 minutes for me to cross the border in a taxi, no queue or anything - literally only one car in front of ours. On the way back was a little busier but no more than 30 minutes. Taxi cost 14000 pesos and took me back extremely promptly...