Russell,
have you seen these guys?
<http://www.digikam.org/drupal/>   it is a linux program, but there are
people using it on Win.
may not be everything you want, but I only produce a couple hundred photos a
month, and so far Digikam seems the best option for me. I've tried picasa,
gallery2, and plain folder filling with rsync.
The site includes wiki and help files, that could be searched for features
you need.

regards
-- 
...AndrewB
-- 
http://www.piclist.com PIC/SX FAQ & list archive
View/change your membership options at
http://mailman.mit.edu/mailman/listinfo/piclist