Unfortunately as you mentioned, nowadays it could be seen that perhaps some parts (Hajj tour operators) are doing it, but in regard to your matter, I can mention some related points, such as:
- Nevertheless we should pay attention that doing Haj is considered as
a Wajib (mandatory) practice for Muslims, consequently we should do
it anyhow (according to its conditions)
- strive to solve the mentioned matter as much as we can, for example
by protesting (I mean speaking) to the related persons in charges or
...
- another significant issue is that it is better that the persons who
have gone to Haj once, then allow others go it.
On the whole, nevertheless, we should notice that Haj is counted as a Wajib act, then it ought to be done for Muslims anyway.