If you look at the most thoroughly mapped countries, they have converged towards tagging of petrol-station roofs as layer=1, and the amenity=fuel as a separate node or area in the vicinity.

Since you have been editing a very large number of amenity=fuel, you are in a good position to ensure that this tagging is implemented.