Are my calculations for flyback diode/s corret?
You are way over-thinking this. A single ordinary silicon diode (e.g., 1N4001) is more than sufficient for this application.

Adding the zener might reduce the dropout time by a small amount, but that is completely irrelevant for your application.