Replace `border-width()` with tokens

[aveline]

As part of this, explore whether spacing tokens can be used rather than border width tokens.