That feels like a misuse of the primary tag waterway= to me. I've not come across ways being effectively used as sat-nav routes or marine parking aisles. Have you got any examples you've followed?
Looking at it again, there's probably an argument for moving the other waterway=canal to historic:waterway too as it no longer exists as a canal, only a marina "parking aisle".