Amp Help - P bass

I'm a complete amp novice. For the first 15 years that I played I did everything through a crappy Fender BXR100 combo. I started back up with a cover band we're going to be gigging soon. Mostly clubs but some small casino type gigs. I'd like to get a decent setup put together. Currently I am playing through one of those recent ampeg combos and am not liking it.

So, I'm not super picky. We play a huge mix of stuff, from motown/funk to alternative modern top 40 stuff. I assume I'd probably go direct on a lot of our gigs. I play a passive 4-string P bass with rounds. I prefer a tighter/punchier sound with more note definition.

Again, I'm a noob here. The Aguilar ToneHammer 500 appeals to me, as do aguilar's cabs, but that isn't really based on any experience. Budget is probably $1k-$1,500

Thanks!