Which Visa Type Should I Select for TM30 Reporting after Extending My Non-B Visa?

Just double-checking. I tried posting this in the other Visa advice group and didn't get any replies. I originally got a single entry 90-day Non-B visa from a consulate then received an Extension of stay stamp permitted until 29 Aug 2020. I travel in and out of Thailand frequently. My question is, for the online TM30 reporting, I used to select visa type 03 (Non-90) during the original 90 days, but should I now select visa type 04 (1-Year) or is that not the correct option for my extension of stay as it was based on my Non-90? When I select 1 year on the TM30 form, it wants to default the admitted through date to one year from today rather than the true permitted to stay till date so I don't know if it is OK for me to just change the date to be 29 Aug 2020. Thanks!