Couldn't tell ya on the water noise. As for the whine, I'd check ur power steering fluid. Mine got low and it whined even under straight acceleration. Or I've even had the bearings go out on my alternator and make a supercharger whine. Check those