Grouping sets of words together when doing spaced repetition?

In my target language (TL) Spanish, there are often words that have similar-but-different meanings (esquina/rincón, pared/muro, encajar/caber, tamaño/talla). There are also similar-sounding words that mean different things (tormenta/tormento, sentar/sentir).

I have been practicing vocabulary doing cloze deletion spaced repetition with Lingvist, but I am considering switching tools (mostly because creating custom cards/sentences in Lingvist is a hassle). If I do switch, I think I might want my new tool to let me group certain words so they'll always be practiced together and my brain will remember the difference better.

I have a few questions about doing that:

• What approaches have you seen used for doing this? A sentence with multiple cloze words? A non-cloze approach based on vocabulary lists? Something else?
• Will it mess with the effectiveness of spaced repetition if I end up practicing one word more often than necessary because it's grouped with another word or words that I keep forgetting?
• What tools are there out there for doing this? My goal is "maintain and practice a vocabulary list of a few thousand words, group some related words into sets that are practiced together", but I'm flexible on how exactly it does that.