In the United States, "college" and "university" are generally used interchangeably. I absolutely agree with your second point and the shift has been going on so long that people are genuinely baffled by the idea that college should not just be "white-collar vocational school"