I highly recommend Thai Visa Centre for all of your visa needs. The staff are very accommodating, helpful and thorough. If you require any assistance with your future visa extensions or any other visa matters, give them a call.