Welcome to OpenStreetMap and thanks for adding this.

For the coffee shop side of your business, it may be worth adding a separate amenity=cafe + cuisine=coffee_shop node next to the bike shop with the same address tags (and things like opening_hours, diet:vegetarian/vegan/gluten_free, etc.).

It's not the most elegant solution, but OSM has a "One feature, one OSM element" principle. On the plus side, both icons should be rendered on OpenCycleMap.

You may also want to tweak the address a little, so that it has addr:street="High Street" + addr:suburb="Green Street Green"

If you need any help, feel free to ask.