A rule like ‘when its after <vars>.sunrise then …’ should work independent of the formatting.
What kind of sunrise rules do you use that don’t work anymore?
In node 13 this problems seems to be solved.
If this double formatting doesn’t work for you, there’s another way to solve this with change of the sunrise module and use a time formatting library.
Is not complex but is is a local hack.