I think I am stuck with the Oil, not sure about the wax though as I've been looking at the Liberon waxes on the web, they say not suitable for kitchens & bathrooms.
As with regards to cleaning the marks, any ideas, as you will see in the picture below they are right in the corners & edges, there...