I would VOID WP n extension and just do one or two border run, that gives you up to 4 month, without dealing with any Thai Embassy or Thai Consulate. They have become very unpredictable.
BTW, we are not an agent, just a transport company that charges THB2000 for Western passport (that includes the THB960 processing fee), for joining Thai person we ask THB500.