You need to reapply by the 23 of May in my opinion if you are doing your own application rather than using an agent. Marriage visas take slightly longer to process.
My family visa renewal date is 6 September. So my application will be in by 6 August. I find the renewal process easy and stress free. In and out of immigration in Rayong in under 20 minutes.