I’m also using Light & Motion rechargeable front, the older model has a really good strobe light that’s last about 5 hours. I’m also using the Cygolite rear, the Hotshot Pro 200 is really bright and will last 5-6 hours on flash mode. I had a lady tell me she could see me a couple miles while riding long flat roads out west.

GPS cycling computers are very reliable now. I create routes on my computer using RidewithGPS and load the route into my bike computer and it works super. It’s alerts you to an upcoming turn and will also tell you if your off course. Some use cycling apps on their smart phones.

If you don’t want to invest in a new bike what about lighter more aero wheels?