Any rape should be a hate crime
I agree with you here. However, I think that has already been factored into the equation when it comes to punishment.
As I said before, technically, I think rape is a hate crime, because it is gender based. However, all rapes are gender based, so why go to the trouble of calling something that happens in every rape a hate crime? No point to it. Just set the punishment, taking that into account.
It would be kind of silly to say "Any rape committed in whole or in part on the basis of gender of the victim is a hate crime," since all rapes are based on gender. Not all assaults are based on race. See the difference?
What about homosexual rape?