I always get a re-entry the same time as I get my 1 year extension even if I have no intention of leaving at the time. For a 1000baht it saves a lot of hassle even if don’t use it.
Remember to get a re-entry permit before you leave on April 12th otherwise you will lose your one year extension and will only be given a visa exempt 30 day stamp when you arrive back in Thailand.