Germany planned for war with Britain in 1948, not 1939

Did German naval planning actually anticipate a war with Britain?

Yes, but the navy was told in January 1939 to prepare for a conflict expected in 1948.

German naval planning did contemplate a war with Britain. The critical date was January 1939, when the navy was told to prepare for such a conflict by 1948. That distant deadline shaped Plan Z and helps explain the poor disposition and incomplete force available eight months later. The answer distinguishes an absence of readiness from an absence of strategic intent.