It made perfect sense to me.

Though Chibi Moon is an obnoxious pain in the ass, so maybe it'd be better that way.

I've personally always been a fan of Makoto and Motoki. Especially in the live action; they were super cute.