And even if Madrigal flies through the system, we really have until 2020 at the earliest to worry about this. I can't see him blasting through A+/AA/AAA and into the majors in 2019. Really we are probably talking about starting at WS/A+ and then a possible midyear promotion to AA. Once 2020 rolls around starting at AA, and then again a mid season promotion into AAA, with a possible September call up. And that is insanely fast all by itself. That process could easily be A+->2019, AA->2020 and AAA/MLB->2021, without it being a bad thing.
If all that comes together, THEN we can really talk about moving Moncada if Madrigal is looking like a guy who will push Moncada off of 2B in two years.