I my opinion correct. But we must always be aware that rulings can change and be ready to change if that happens. Actually moving to ERC-20 could change the situation since it shows an intent to be a tradeable asset and potentially not be a “token” and could show a silent indicator that a promise of financial gain may have been given. A long shot but who knows.