Yes, that all sounds right.
But do note that I have not yet wired up the resistor/diode circuit for testing, so I don't know if it actuall works. It won't harm anything regardless.

Those diodes are fine.

Cheers!