I fixed it I think, tell me what you think!
And that sounds good, I didn't want to evolve too early and I have a way to factor in the friendship I think, we can recruit Pokémon right? Obviously further down the line. I'm gonna re read the OP to make sure I understood everything.
And that sounds great about the shiny stone, thanks!