My thought is if the HST's are all trimmed to the same size then use them. No need for any re-doing. Personally, I like the pinwheel setting better. Try setting everything in pinwheels and see what you think.
Consider adding a 1" sashing in a white that will match the background as much as possible.
Good luck!
As for quilting, try straight 1/4" stitching.