It is impossible to cover all scenarios for tariffs. e.g. Some are seasonal, that woudl not fit in your schema.
The current situation where you set the option “Use an entity with current price”, leaves it up to the end user to automate this value and will fit all situations.
The same option could be available for fixed costs. The difference being this entity is only added once per day not per kWh.