Currently, the majority of BTC owners are investors. If it becomes mainstream, then maybe change it, but for now the classification is correct.
The problem is, Bitcoin will never become mainstream and function as a currency if this regulation stands. The chicken just ate the egg.
The USA wants this to fail so badly.