Personally, I’d give the wire a little headroom. 16awg is a fraction more expensive. And you’ll be surprised how the small distances add up. It’s not calculated just to the connector.
Plus, I think it’ll be just fine on the bike. Remember, you’ll never have full beam, side lights, brake lights...