I make a big deal out of "lack of diversity" in the field. I, like most people I know who think this is a big deal, do not think that this is exclusively or even primarily due to bias in hiring. I attended a majority black school, so I certainly understand that there are upstream problems.
All of the problems you identified with (2) are still problems of equality around opportunity, not outcome. Identifying that there is a problem, even if it doesn't naturally point to solutions, is still worth doing - because as you can see in this thread, there are plenty of people with a lot invested in denying that there is any problem at all.