Yes, that’s why the sensor is called “Next Rising” not “Tomorrow’s Sunrise”…
The automation I provided was design around the premise you described in Post #3… Specifically, that the trigger would fire after sunrise. If you change the trigger from what I used, you will have to modify the templates to account for it.
If you plan to use sun-related values and need values that don’t rollover like those from the Sun integration, you may want to install the custom Sun2 integration