I have just written a post suggesting the removal of the current cap of 16kWh on the battery subsidy that was recently enacted. I would welcome your feedback here or on my blog.
Darryl Siry's Blog: If not a gas tax, increased battery subsidies
Darryl Siry's Blog: If not a gas tax, increased battery subsidies