Digital is cool, but IMO, it'll never surpass film, ever ever ever.
Nikon makes very cool stuff, digital and film alike.
I just got a Nikon 4300, which pulls 4megapixels and is fairly "midrange." I'm not sure how it holds up with macro settings (if at all). But the Nikon 880, Nikon 3100, and Nikon 4300 are all very cool cameras that will pull probably what you're after.
The canon powershot series, specifically the Powershot S45 seem to be very nice, although I have not had a great deal of first hand experience with them.
I strongly suggest you check
www.dpreview.com if you haven't already. It'll have just about everything you're looking for, and you can side-by-side compare different models/brands. For the amount of money you're going to drop on a digicam, it's worth doing some searching around.
I've had good luck on photography equipment at:
ritzcamera.com
bwayphoto.com
keh.com
Especially on keh.com, although I primarily only purchase SLR film stuff from them. Ritzcamera.com and bwayphoto.com often have good deals on things, although their prices tend to fluctuate greatly, therefore one is not better than the other. Sometimes ritzcamera will have something for a great price, while bwayphoto might try to pull something at MSRP, or vice versa. Example, ritzcamera offers the Nikon4300 at 450.00 or so, while bwayphoto asks 360.00. Shop around.