Another option is move to WPA3.
WPA3 is the way to go. You can have the client on WPA2 and your AP on WPA3. Android, Apple and Microsoft supports the protocol.