I'd keep the amenity=shelter, possibly changing it to a polygon. There are a places where the shelter and the bus stop are sufficiently distant from each other to justify it, particularly with the high resolution imagery we have in London.