Anna -
It seems you are using the shapes tool for a lot of things! Just to let you know....the ONLY time I use it is when I need a shape that I can't get with the marquee tool. If I can make it with the marquee tool...I do that...so much easier!

You can still do it with the brush tool...but you just need to make a new layer for each stroke.