Yes. I replaced it today with the vertical style (wema), and what a beauty.
Like you said, no more guessing, no more worrying.
In the end, I didn't empty the tank. At this point, I'm confident the tank's label is fine. Yesterday, I filled up the tank and used approx 20 liters (based on...