Yeah, I found threads where Ethan says if you use enough panels you will effectively dampen the room modes. He says he hasn't messed with HR's enough to advise people about them. I suppose there is a reason why he sells panels and diffusors.
I would try panels first and foremost and then remeasure the rooms response.