And btw... CFM upgrade can be done easier without much randomness.
1) Clear Cathedral from all monsters
2) Summon Edyrems and lure them inside cathedral to catacombs entrance, wait for one avatar to spawn (let's say they spawned Imperius)
3) Make tp and go in town, then go back in Inner Cloister through wp
4) Summon another Edyrem pack and wait for another avatar to spawn (Malthael in this case)
5) Kill Malthael and get the swirles, while having swirles go in town through wp, then go back to Cathedral through tp you made before and kill Imperius to get another swirles.