Games : Inclusive redstone repeater

So, I have this:

Now, what I want is a repeater that would work while keeping the unlit lamp on.

Yeah, that one right there:

I have this already:

...but the piston turns on and off repeatedly until the input is off.