You can definitely use the same border pieces. First use starch and press them being sure they are absolutely flat. I think you are right in taking off the border and re-doing. It's always easier to fix a problem at the stage it occurred than to try to take care of it somewhere along the line. (Learned that the hard way, several times.)