I wish there was a non committal way to test a dynamo hub. My local bike shop doesn't have anything. I've read on many occasions where tom talks about the benefits of a shaped beam and not having to worry about batteries. I've been chasing my ideal headlight to round out what I perceive is the best bike for me [2016 GT Grade with 105 and TRP Spyres). The inky thing I've not done is try shaped beams or dynamo lighting... I have a spare wheelset and I think I'm just going to bite the bullet and build a QR dynamo front wheel and try some lights.
To the OP, that's an awesome bike. Best of luck with it. Try updating your points of contact. My favorite was upgrading to the thickest lizardskin bar wrap. It made a noticeable improvement for me while riding gloveless. Not a huge investment but a big enough return for me.