Don't leave me Sandrone! Not yet!

I need to mentally prepare for what's going to come in Genshin in a few days. Hopefully they make it clear that Sandrone is coming back a few patches later or I'll be sad...
The leaks all seem to point out that she won't be released until June/July in a specific story dedicated to her which is quite a long wait. I really just want to see them together happy just playing around teasing each other like in the other patch.
Also is she going to be Electro like the leaks seems to imply? She currently has more of a "physical" look, but maybe with the redesign...