Having experienced this same issue, I've always wondered about diluting the hops while diluting the fermentables. Assuming you hit target volume with a specific gravity that is too high, wouldn't adding additional water create a less hoppy beer? How do you mitigate that?