Good ideas! That restructuring was one I hadn’t considered, but it does make sense. My current scene placement is for the first to serve as a break between the Falcon map scene and the Falcon’s arrival at Takodana, and the second scene to happen directly before 3PO informs Leia of the incomplete nature of the map.
My rationale for keeping this placement is that while pushing the reveal of Snoke back to practically act 3 is good from a logistical perspective, this also pushes back the on-screen introduction of the Starkiller until after it is discussed by Poe, Finn, and Leia. They discuss it as if it has been introduced, after all. I suppose the same can be said for Snoke as well - elements like the Emperor 2.0 and Death Star 3.0 should be established early to set expectations, otherwise the final third of the movie feels much more derivative due to backloading it with these bog standard threats.
But still, I do like what you’ve suggested.