Couldn't I just use the setup I have, but with the diodes?

 

Heres an example of using logic to flash /chase leds....the logic can be arranged in many different ways to get the output you reqire,why dont you use a 4013 with your circuit-you can arrange the switches you require to set or reset the flip flop as you want

 

I am limited on the chips I have available.