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).