If you are happy with the ProCurve products, I think the current offerings from Aruba/ProCurve family will suit you well. The 2530 24G PoE+ (J9773A) is great if you want 1Gb SFP uplink ports. Otherwise, jump to the new 2540 PoE+ 24G SFP+ (JL356A) which has the 10Gb capable SFP+ ports.
I love the HP switch selector tool for this sort of thing. Just make sure you filter down to only the Aruba products if you want to stick with the switch series that you’re familiar with.