I would stick with the straight lines, an inch or two from your stitch in the ditch lines. Each current stitch in the ditch would have a stitch on each side of it. I would think that would do fine. Not too sure about the inside of your cups, if that is five inches. Maybe echo stitching there too?
YOur quilt is beautiful. I love it!!
Dina