The hp loss from raiko is meaningless, no reason to replace her for cyclops unless you need cyclops cleanse, joan is too slow for thunder so shouldnt be considered unless you dont meet the dps check of AQ5 andro (the whole reason of having baal is to not run d'art cause shes too slow, and you suggest another slow soul), you are basically using 2 slots (soul slot on top of that) of a team just to replace what raiko alone offers? thats just ... no suitable words.
Anyways, try shingen brahma baal raiko mammon, that way you have your EX free to use cleanse, dispel or w/e you want, thor is honestly just a UE slave, but if you like her nukes you can replace mammon with her and run snipe on shingen, up to you.