Gingham Stitch Edges

Being the gingham stitch necessitates wrapping each color at each end, how do you keep those stitches neat? And in anticipation of adding border, how to work those first/last stitches (calls for each row to begin and end with K st) to best accept the border (and not have the secondary color showing thru the border). I’ve been working a test strip and the body looks fab but the dang edges look unruly.

TIA,

cam

Bump