So if it's out of gear, but rolling forward at tickover, then there's no whine? If so, you can rule out the water pump because that's turning all the time the engine is running. Also water pumps give their trouble by loosing water rather than bearing noise. Try some more experiments. For instance does it whine more when turning or straight ahead? How about when the clutch is depressed?