Dialing in Morvahna1

I'm in the process of finalizing my list pair for the OTC and thought I'd tap into the brain trust here.  Currently I'm planning on a Morvahna1 as my primary with Una2 running back up duty with an assassination list when I feel like M1 will be out attritioned (which isn't often).

For reference Una2 list looks like this and I'm practiced enough with it that I consider it set:

Circle Army - 75 / 75 points

[Theme] Call of the Wild

[Una 2] Una the Skyhunter [+29]
- Gorax Rager [7]
- Scarsfell Griffon [8]
- Scarsfell Griffon [8]
- Scarsfell Griffon [8]
- Scarsfell Griffon [8]
- Scarsfell Griffon [8]
- Scarsfell Griffon [8]
- Storm Raptor [34]
Blackclad Wayfarer [0(4)]
Blackclad Wayfarer [0(4)]
Bog Trog Mist Speaker [4]
Lord of the Feast [0(6)]
Boil Master & Spirit Cauldron [5]
Shifting Stones [3]
Shifting Stones [3]

Now for Morvahna I've been running this and trying to dial it in:

Circle Army - 75 / 75 points

[Theme] The Devourer's Host

[Morvahna 1] Morvahna the Autumnblade [+28]
- Brennos the Elderhorn [15]
- Rip Horn Satyr [14]
- Tharn Blood Shaman [4]
Gallows Grove [2]
Lord of the Feast [0(6)]
Tharn Ravager Shaman [4]
Boil Master & Spirit Cauldron [5]
Bríghid & Caul [7]
Shifting Stones [3]
Tharn Bloodtrackers (max) [15]
- Nuala the Huntress [4]
Tharn Ravagers (max) [15]
- Tharn Ravager Chieftain [0(5)]
Tharn Ravagers (max) [15]
- Tharn Ravager Chieftain [0(5)]

I've been happy with the M1 list but after reading Jaden's take on Grayle I'm wondering if I can't get more out of it.  Seeing how the ambushing bloodweavers enable the ravagers to do what they do better by forcing the enemy to clump up the middle really got me interested in including them.  Also I've found that 11" threat on the ravagers is good but getting the extra 2" by including Lanyssa would give me just that extra bit of board presence that can make the difference in a game vs guns.  Missing out on the bloodtrackers ability to remove a heavy early could hurt but I was finding that opponents were making them a priority target and restoration was too valuable on the ravagers to consider putting it on trackers turn 1.

Today I'll be testing M1 v2.0

Circle Army - 75 / 75 points

[Theme] The Devourer's Host

[Morvahna 1] Morvahna the Autumnblade [+28]
- Brennos the Elderhorn [15]
- Rip Horn Satyr [14]
- Tharn Blood Shaman [4]
Bloodweaver Night Witch [4]
Lanyssa Ryssyl, Nyss Sorceress [4]
Lord of the Feast [0(6)]
Tharn Ravager Shaman [4]
Tharn Wolf Rider Champion [0(7)]
Boil Master & Spirit Cauldron [5]
Bríghid & Caul [7]
Shifting Stones [3]
Tharn Bloodweavers [8]
Tharn Ravagers (max) [15]
- Tharn Ravager Chieftain [0(5)]
Tharn Ravagers (max) [15]
- Tharn Ravager Chieftain [5]

In this version I'm torn between keeping the stones as my primary sack pawn safety net or trying to build towards getting a better heavy than the rip horn in there.  The rip horn has been doing very good work in controlling and clearing zones though (bulldoze + Mat 8 grab and smash are awesome).  I'm also not sure if I want the night witch or the haruspex.  I haven't had enough table time to decide between the two and am looking for your thoughts here.

The other option is v2.1

Circle Army - 75 / 75 points

[Theme] The Devourer's Host

[Morvahna 1] Morvahna the Autumnblade [+28]
- Brennos the Elderhorn [15]
- Ghetorix [19]
- Tharn Blood Shaman [0(4)]
Bloodweaver Night Witch [4]
Lanyssa Ryssyl, Nyss Sorceress [4]
Lord of the Feast [0(6)]
Tharn Ravager Shaman [4]
Tharn Wolf Rider Champion [0(7)]
Boil Master & Spirit Cauldron [5]
Tharn Bloodweavers [8]
- Tharn Bloodweaver Haruspex [4]
Tharn Ravagers (max) [15]
- Tharn Ravager Chieftain [5]
Tharn Ravagers (max) [15]
- Tharn Ravager Chieftain [5]

In v2.1 B&C and the stones are gone and I gain Ghetorix and the haruspex.  I'm really torn on this version because only extensive testing would really tell me if B&C + stones is worth the exchange for the upgrades but time is too tight to get that experience.

So I pass the lists on to you guys for comment.  What do you think about the different versions?  The only thing I ask to keep in mind is that the core of Morvahna1 + 2xRavagers + Shaman + Brennos + LotF + Pot is set in stone (I've practiced those models too much to try and revamp my thought process).  Everything else can be played with.  If you see some combo I'm missing I'm all ears.