I'd go with CB this trip. Assuming you'll be there for a few days, you can easily get in all the rides/attractions with relatively short waits if you are strategic in your touring plan. You're going to be there at a very HOT time of year, so you're probably not going to want to be in the parks all day anyway. It's super fast and easy to get back to CB for a rest or dip in the pool during the heat of midday. No matter where you stay onsite, you'll get early morning access, which can help you knock out a headliner or two, and get you in the park early enough to join the virtual queue for Hagrid's coaster, which currently does not have EP, and is reported to be the best ride there.
Another option might be to do a split stay. If you keep 1 night at HRH, you will get 2 days of EP, which is more than enough time to do all or most of the attractions. When we went a few years ago, we had EP, and basically did everything we wanted to do in the first two days, and spent the next two days going back to our favorites. However, I know that rates go down the longer you stay at one particular hotel, so a split stay might be more expensive than the cost of one night at HRH. Still, it wouldn't be $1000 more.