A little update

I went swimming again yesterday, and applied some coconut oil to my hair before putting my cap on, and washed and conditioned as before, except that I'd diluted my conditioner a bit more. To try to avoid getting frizz by letting the wind blow-dry my hair, I rolled it up in a bun, and put it down again when I arrived home, to let it dry.
By evening, I had lovely '40s style waves, with the only problem being that my ends felt very dry when I passed my fingers through my hair, so I decided to apply a little coconut oil to the ends overnight. Unfortunately, I must have put too much in, as it still shows now, and I'm not very experienced at oiling my hair yet, but I'm not going to touch it for now. However, apart from that, I'm happy with it.
I also bought Weleda's Lemon Balm and Orange Blossom shampoo, which sounds like it's full of good stuff, from the ingredients list anyway, so I'll be trying that soon enough, as my shampoo bar's almost finished.