Now, if you want to define Chareidi without the Kollel vs. working aspect, then I will agree with you, to a large extent.
Can you please elaborate on that point?
(BTW, I still don’t agree with you on the Kollel aspect. Even in Eretz Yisroel the proportion of Chareidi men in Kollel is a small portion of the number of Chareidi men working. Two points you should consider when analyzing my point is that 1) Chasidim are a large part of the Chareidi population and they generally do not stay in Kollel long (if at all) [but even the non-Chasidic Chareidim are much more working than learning full-time] and 2) Official working figures for Chareidim are very very underreported in Eretz Yisroel due to the draft situation.)