A simple change to the registration fee that scales it up proportionate to Vehicle weight would be a perfect fix for this. They could even scale it down for ebikes / motorcycles and create a much simpler system for evaluating how rego is charged?