haha, not expert. just learned lessons in hard way :(

yeah, try to roll with credit. But if not doable, roll with small debit is fine too. Basically when you buy intrinsic value while selling time value, you won't be too wrong.  

Aslo, after rolling, you may sell put or put spread more aggressively than you would usually do.