Hi Al, Glad the guide is useful.
Yes your option 1 or option 2 would both work.
For option 1, use a power resistor with sufficient rating (say 10 ohm, 2W). Careful monitoring would be needed. Be sure to stay above 3.0V.
Option 2 should work fine too, might take a while depending on how many cells you can charge while the sun is out (and giving you good power in the solar panel).