Pending feedback on which is preferred, in my reply at https://wordpress.org/support/topic/file-naming-is-seo-unfriendly/#post-18006309