Christmas Cactus

Christmas cactus is one of my favorite plants - probably because it's so hardy, even I can keep it alive for years - so when I saw a class at my favorite quilt shop featuring this design, I had to sign up.
We completed one set of 4 paper-pieced blocks in class. Now I need to decide how to finish this - make 4 additional blocks, as pictured in the book;
set it on point, add a series of borders and call it good;
or set it square, add a couple of blocks - like the 2-parter above - on top and bottom, and border it. 

Think I'll sleep on it. Opinions welcome!