Thanks for that clarification! I edited my schematic accordingly. Maybe you could have final look, before I solder it all on a hole grid board 
Oh, btw I left the diodes in there, because ... well I ordered them and I guess my teacher will like additional safety measures. I got SB530 which are in DO-201 packages, they're so huuuge!! I like components that look like they can take couple of Amps