IMHO, I'd definitely do a double border - using one of the florals along with the yellow. I think using the yellow on the border would balance it. Not that I know from personal experience yet, but from what I've read and seen here, the final quilting can really change the feel of the quilt - and take a quilt you're not too sure of and make it really special! (So I'd say don't take it apart!)