It took a bit of hammer whacking to get things to seat properly and toothpicks to get glue all where I wanted it, but it's square and everything is seated ok. This will sit overnight and I'll unclamp it after work tomorrow and see how it came out.