To deal with the tiny partial diamonds try using a Dembart S-1 tool with the cutter installed 180 degrees from normal so that it cuts on the pull stroke. Makes it easier to complete those pesky little buggers without running over your borders. It's a trick I picked up years ago, it works for me (most of the time).
That's how I work up to borders, on the pull stroke with both standard and short cutters. I don't see how it can be done cleanly otherwise, but it did take a couple stocks before I wised up to it! Ah, the hubris of youth. I typically work a pattern with three tools set up, those two and a standard cutter on the push stroke, after laying out the lines with a two row cutter. I started with Dembart tools decades ago and don't wish to switch at this point!
