Is this snapshot for both token allocation and NFI or are they separate?

They are separate. The upcoming snapshot doesn’t include the 2 x Think Agents (NFIs).

Keep your BASIIC NFT for the Agent (NFI) Airdrop.