I’ve had a detailed poke around and without getting more complex than I really want to for this project, there is no simple fix for this. My decision is to live with the default and request from woocommerce a tweak in future versions. Thanks to Coen.