Thanks for the recommendations. Unfortunately I'm not still under warranty (expired), but this job doesn't look like it's too hard to do.
Call me a luddite, but it's irritating that something like a water pump needs to be electronic. Then it fails without warning, (and there's no temp gauge to monitor the system) and costs 4x as much as it should. Why, all to save a couple MPG?