I recently switched to a Cube Nuroad with factory dynamo, including the essential rear stand light. Wouldn't go back to battery lights apart from a good Exposure or Leyzyne rear light to supplement.
We always overlook side visibility though, that could be worked on.
There should be 2 points of adjustment for a cable clutch - yes, have a go with the top adjuster but you should also have an option at the engine - you can probably get a manual for your model off the net and guidance on Youtube.