Don't know how to fix your latches, but unless you are troubleshooting this for the nostalgia there is a much easier circuit now, that does the same thing. to make it, link:
OR 1 ->NOT 1 ->OR 2 ->NOT 2 -> OR 1
OR 1 and OR 2 are your input and reset, respectively. After the gates have been...