@masterwolf you can throw stray to a corner for the time being. he's no longer a priority. shao...I don't think she's mincost? if so, unlikely you'll need her as well (since you might as well field soma if you need a low cost archer)

your main team is roughly settled, just need 1 valerie to fill up 2 mage, 1 calliope to replace cloris (for low cost witch) and 3rd healer.
as for units in 2nd pic, take out crave, momiji, marie and probably verotte. these 4 will not be necessary in the near future. also add a valkyrie into the list to level.