How should one proceed if one is waiting for Wifi 6 AP?

I run SFOS 18.0.5 MR-5-Build586 on my own hardware at home, with an AP30 for domestic Wifi. I plan to upgrade my AP when a Wifi 6 access point becomes available.

Yesterday I upgraded my SFOS to 18.5.1 MR-1-Build326 to find that my AP no longer works - so I had to downgrade again. Today I see that there is a v18 MR6 release available, or shortly to be available. I am hoping this supports AP30!

I prefer not to buy an "Interim" AP to be replaced when a Wifi 6 one becomes available, but I would like to be running current patched software on my firewall!

Will I be able to keep my current AP30 running v18 MR X versions until I can buy a Wifi 6 AP? Is there an announced plan?

Many thanks for your help!

Regards,

   Paul McGinnie