As long as your residence is in Bangkok itself and not outside like Samut Prakan, Chaeng Watthana would be the primary office and used for all long term visas and extension.
The old temporary office at Muang Thong Thani is now closed and they have moved short term (visa exempt, visa on arrival) matters to IT Square Lak Si.
You might also make a reservation if you like:
********************************************
*****