I definitely agree with that first choice.
EDIT: Also, the rival. I was thinking about this. The Rival should definitely be more like Gens 1 + 2 instead of 3 + 4. Sure, having a nicer character like Wally (or even Dawn and Lyre in DPPTHGSS). But The rival shouldn't be your friend. He should be this badass guy. In Gen one we had this huge douchebag who only even started his journey because he wanted to be better than you. He was always one step ahead of you and he rubbed that in your face. In gen 2 we had an actual villain who stole Pokemon and was all-around cruel and abusive. We need someone like this.
EDIT: Also, the rival. I was thinking about this. The Rival should definitely be more like Gens 1 + 2 instead of 3 + 4. Sure, having a nicer character like Wally (or even Dawn and Lyre in DPPTHGSS). But The rival shouldn't be your friend. He should be this badass guy. In Gen one we had this huge douchebag who only even started his journey because he wanted to be better than you. He was always one step ahead of you and he rubbed that in your face. In gen 2 we had an actual villain who stole Pokemon and was all-around cruel and abusive. We need someone like this.