Yep, SPV is a type of Bitcoin client, and you're spot on – Bitcoin clients can be wallets too.

Think of it this way: All squares (clients) are rectangles (wallets), but not all rectangles are squares. Some clients just do more than hold your cash and keys! 🟥👛