I agree with you; the only problem I see is that they both share the same contact info and we cannot say where they are placed relative to each other. Apart from that, I am OK with your solution. Feel free to improve the map or If you prefer, I can try to do it myself in the next few days.

Happy mapping,

Marco.