Wow! For someone who claims to have issues with triangles, you made a darling - shall I say delightful? - quilt! I love the chickens! If the batting says you can quilt 10 inches apart, go with Tartan's Xes.
Stitch in Ditch is way too much trouble and frustrating. Xes are fast and and easy. Marking them with tape is a great idea.