Better late than never
It looks like I'm a little late to this party, but seeing your schematic made be cringe!
I guess I should start off by mentioning that I am an electrical engineer, so I know what I'm talking about.
What's right:
On the positive side, you did keep ground as ground, and...