I'm glad to hear you'll be working on this more. I really want to see this game go places, so I have a new way to play Fire Emblem-style games.
I will add that unless there's a reason to not use point and click (for example, if it doesn't work in Godot) it's just better to make it point and click.
The times with units changing was on restarts. While I know it's rogue-like and thus there's some randomization, I don't feel like there should be that wild of a swing in teams. Maybe a minimum team of 4, with a guarantee that those four will all be different base jobs? That way you always have four different units, and the other potential two could be different or match the ones you have.