Yep. Its the same bs with making D's persecuted or hunted down, or retconning the Gomu Gomu into the Nika fruit. The minute Luffy's existence reached the marines along with his devil fruit, which still wasn't awakened, should've warranted an immediate pentagram teleportation or sending cipher pol or gods knights to destroy him covertly and immediately without raising alarm. Wano was the beginning of the end, and Retcon Valley is a glimpse of what awaits us further.