I always square each block before joining the rows. It usually works best if you being the squaring up with smallest block. And use those measurements. Not sure if adding borders to a wavy top will end up like you want. Hope someone has the answer for you. Do not give up okay
Judy in Phx AZ