Thanks everyone.
I went and got a FQ of a dark blue without a big white print on it. I'll remake those two blocks and then I think I'm going to go with option 1. That's how I sketched it up to begin with and I'm thinking once I swap out the blocks, I should like it more. Will post pics of it all put together tomorrow with the pieced border!