Personally, I'd ditch the notorious, underperforming OEM tires. Sounds like a simple case of hydro-planing to me.
I've drove through heavy rains with Firestones on my '12 TE, even while pulling a camper, and traction/steering has not been an issue.
No clicking sound observed so far with 3,500...