I'm not as familiar with Krav Maga so I can't comment too much about it.
I know from my own experience BJJ will give you all the tools you need for when a fight goes to the ground. Muay Thai is perfect for stand up self defense.
Both styles are proven, practical and complement each other nicely.