Definitely two quilts!
I looked at the big block and I think that if you do a smaller scrappy border around the outside it will really pull out the scrappy look of the center and downsize the plain-ness (how do you spell that? plainness?) of the current outside border.
Can't wait to see what you do!