Well, yes of course. They are really stupid tariffs.

If this happens the storage manufacturers are gonna start charging a ton

Let them do this. The world needs a reminder that tariffs are a tax on customers.