Something that might help both would be some sort of precursor event. Sounds, strange lightning, brief distortions before a storm, becoming more frequent and longer until the storm itself starts. And maybe have a small rift form a minute or so before a spawn arrives at that location, allowing you to vacate the area or stop whatever you're doing and get to a secure area or prepare for combat. Maybe allow the spawn-rift to be dispelled with bright light, the required light level increasing in a storm to something impractical to just maintain everywhere in a house.