Had a bash at this one. Helped by a strong theme and everyone on here. I was overlong on 29d as I couldn't get water companies out of my mind, 😄
Despite ChrisE's hint I still can't get 17a (went down the diamond's are a girls best pal route, until crossers thwarted that)
But also 2d where I still haven't determined which is the definition, and this always muddies my focus.