If you really want to get the most out of your $1000, have you thought about DIY or kit loudspeakers? These sound a lot better than they should for the money.
At least half of my listening is old punk rock with lousy production values but the rest is a mix of other rock styles that might be improved with better equipment.There are some amazing punk / heavy rock recordings, you might be surprised how much better they can sound.