Custom build oil tank level sensor (Mysensors sensor type problem)

[bilbolodz]

I've made sensor for reporting oil level in my tank. It's mysensors based. Unfortunately I've problems with choosing correct sensor types and reported values. I'm measuring (and reporting):
- oil volume left in tank (actually it's distance meter and some math)
- percent of oil left in the tank (also distance and math)

I've chosen S_WATER sensor type (for both values, separate sensors), volume is reported using V_VOLUME, percentage as V_PERCENTAGE.
Unfortunately Domoticz recognizes:
- oil volume value as RFXMeter and reports liter as kWh
- oil percentage as Light/Switch and dimmer

Which S_TYPES and V_TYPES should I choose for Mysensors to get reasonable results in Domoticz?

Best regards

Piotr