Is There A Poipet Alternative?

[Highwayman]

I will be driving from Surin to Bangkok on a Sunday and was wondering if there is another border crossing enroute other than Poipet /Aranyprathet where l could update my Non Imm. "O" visa?

My map (old) shows a crossing at Chong Chom. Is this an international crossing point available to visa runners? I was hoping to avoid Poipet which l imagine would be very busy on a Sunday. I'd prefer driving a few extra kms to standing in line for ages at Poipet.