That's the idea Riki. Looks like you have it fitted up very nicely. Good idea mounting R2 vertically like you did. Fits better. I would maybe use a screw driver to bend that diode lead a little, where it is very close to the jumper wire; just to give a bit more clearance. You don't want them to touch.
It looks like you are nearly ready for a test run!