Magento Categories SEO Url structure - keyword stuffing

Hi There

I just needed some advice as to the best way to organise Magento categories and url settings.  Magento allows two options, to use the full category path as url or the product name.

I set up categories with keywords but I think I made a mistake setting up subcategories with keywords too so for 10% of items the url may look like:_

www.xxx. com/e-cigarette-kits/e-cigarette-starter-kits/ego-e-ecigarette-starter-kit if using full path or

www.xxx. xom/ego-e-ecigarette-starter-kit    if using product.

The full path looks spammy 10% of the time but for 90% of products its better as the product name/url contains no keyword.  Eg

www.xxx. com/e-liquid/menthol flavour
www.xxx .com/menthol flavour


I can either rename the subcategories to avoid keyword overuse or just use the short product url.

Any advice gratefully received

Thank you.