Anyway, I think we are going to see a lot more discontinued hardware wallets in near future.

You have that right, 100%. Most HW wallets are pure crap, and that assessment is just from me browsing Amazon and bitcointalk. I'm guessing there will come a day when people figure out that they can build their own or don't really need to shell out money for a device that may or may not be secure. That day might be a long time coming, but I'm confident it will arrive just like the day when people wake up and come to the realization that the thousands of altcoins on the market are mostly scams designed to enrich the coins' "devs".
I'm getting more curmudgeonly and pessimistic as the years pass--I can't imagine what my attitude is going to be in about 5 years or so.
Even if there are a lot of crappy hardware wallets, I cannot see normies or even grandmas wanting to build their own.. and yeah sure there could be some universally purposed kinds of devices that might be repurposed to use as a hardware wallet, yet there still seems to be a dynamic in which there is going to continue to be a market for hardware wallets... Otherwise, yeah we are using devices that we hold for other purposes as our hardware wallets like our phones, computers and/or other digital assistant devices (which technically would be software wallets, no?)