@Linkat,
My kid has curly/ wavy hair that tends towards the frizzies too. She uses Herbal Essences and it really seems to work pretty well. They have two, a violet and a purple, "totally twisted" and something with "tousled" in the name. Edit: "Tousle me softly." Weird names but they work well and aren't that pricey.
I also just started using moroccan oil on my own wavy hair and that's been working pretty well. But it's expensive.