Thanks for the info guys and or gals, I really appreciate it. I only do about 7300 miles a year commuting and rarely over 10k even with some joy riding. I'm going to pick up a bluetooth OBDII reader and BMWhat/Torque so I can see any codes that might pop up. I'll come up with a bi or tri weekly schedule to check for codes. It sounds like I may get another 2 years or so of service out of the water pump and that I should have at least a little warning before it goes.
I'm going to go ahead and do Oil/filter, Trans fluid (it's a manual), Diff fluid, Power steering fluid, plugs and coolant. I'll pop the cover off the motor and check out the valve cover and make sure it's just a minor leak, barring a major one I'll let that sit for a bit. I'll inspect the hoses, filters and coils for damage and if needed I'll replace. I'll hold off on the O2 sensors and charcoal canister until I need to swap them I think. The brakes were flushed last year and should be good for another year.
If you can think of anything else I should do please let me know!
