Oh, and I definitely agree with you on the Psychic Maelstrom being a mechanical threat (instead of the general use of the term). I think the same advice was in 1e and I interpreted it the same way as you, and it makes the Psychic Maelstrom way more interesting than just a thing players invoke a move for every once in a while, especially if you make it a Grotesque or something weird.