I would swap the craksent & bottom bracket to something like this:
https://www.rivbike.com/products/cra...40807881867375
There are many other options. as far cranks go. Thers will chime in with suggestions I am sure. I have found that lower wider gearing works better for the type of riding I enjoy. The racing gearing of yesterday is reall y cool to look at and functional for some but I find it to be limiting.