I don't fully understand your post.
While I understand wanting to upgrade from the feature limited and slow TP-Link, why upgrade to the MB Pro? I would highly recommend to instead upgrade the Meteobridge on the Raspberry Pi as the user interface is even faster, it can easily have more data storage with the right SD card, and it will cost you much less than a MB Pro, and you'll also gain the embedded Weather34 dashboard that the MB Pro does not have.
Which is why I don't understand you mentioning your new Raspberry Pi 4, but you don't mention what you are doing with it.