Momentary\Pushbutton Latch Switch
A thought:

S1, below, is a SPDT (Form C) momentary pushbutton switch, and you can get rid of all that circuitry with a single chip, like this:



EDIT:

On second thought: