I think Sugar and Sway would be great help with Kahea's current "whoa is me" mood she's been in for a while. And Kahea would love someone to danec with.
Bee might be right up Mac's alley in terms of demeanor. Maybe Bee is taking a few "self defense" classes from Mac?
Knight sounds like a great character (and I love the PB) Kahea's father was in the squadron The Black Knights in California. I could see some kind of connection between him and both Mac and Kahea. Mac needs to be around more kids, for her own good, and Kahea loves teaching kids about dance and swimming. Any ideas for plot let me know! My mind is actually a bit blank at the moment... argh!