Depending on your current stay inside Thailand and with 400.000 Thb in your bank account you can apply for:
Conversion into the Non Immigrant O visa based on marriage
Extension of Stay based on marriage and when that is stamped into the passport the Multiple Re-Entry Permit to travel during the year.
OR
Visit the Thai Consulate in HCMC Vietnam or Savannakhet Laos who issue the 1 year Multiple entry Non Immigrant O visa which gives you 90 days of stay on each entry.
IF you're inside Thailand using the Visa Exempt Entry or the Tourist Visa you can visit your local Immigration Office to apply for a conversion into the Non Immigrant B visa.
Your Extension of Stay with the Re-Entry Permit are registered in the Immigration Database. Just using a new passport does not change your fingerprints, face, name, dob, gender, nationality etc, only change your passport number. It will be linked.
If you want to enter before 24 July you have to discuss with the Immigration Officer to use the NEW visa and not the Re-Entry Permit.
You can re-enter Thailand before 24 July, using the re-entry permit and visit the Immigration before 24 July to apply for a new Extension of Stay. It is not 1 month in advance but during the last 30 days of your permitted to stay period.