New laptop: AC 9461/9560: iwm or iwlwifi?

Hello.

I have a StarLite laptop where I installed 13.1, but I can't seem to 
make WiFi work.

It features the following chip:
> iwm0@pci0:0:12:0:       class=0x028000 rev=0x06 hdr=0x00 vendor=0x8086 device=0x31dc subvendor=0x8086 subdevice=0x0264
>     vendor     = 'Intel Corporation'
>     device     = 'Gemini Lake PCH CNVi WiFi'
>     class      = network


By default, as can be seen, iwm attaches to it and recognizes it as 9560:
> iwm0: <Intel(R) Dual Band Wireless AC 9560> mem 0x91118000-0x9111bfff at device 12.0 on pci0
> iwm0: hw rev 0x310, fw ver 34.3125811985.0, address 20:1e:88:78:ac:3a

Then it spits out a lot of debug info and ends up nagging with repeated 
"iwm0: could not initiate scan".



So I put 'devmatch_blocklist="if_iwm"' in rc.conf, in order to try 
iwlwifi: strangely, it attachs but thinks this is an AC 9461!

> iwlwifi0: Detected Intel(R) Wireless-AC 9461, REV=0x312

Then, like iwm, it spits out a lot of errors and the network does not work.



Before digging in it more deeply:
_ can anyone tell for sure what this card is? 9461 or 9560?
_ what should I use? iwm? iwlwifi? Anything else?
_ is this expected to work on 13.1? Do I really need to upgrade to 
stable? Could I cherry-pick something in order to deviate the least from 
release?


  bye & Thanks
	av.

P.S.
I know a lot of work has been going on and I've seen many info through 
the mailing lists and on the wiki. However, I find it hard to recap all 
these info. Sorry.