YES

Yes.

We can keep watching for the dream houses in the dream locations, but not untill the worst has been prepared, that when we upgrade we will be fine if the prices drop even more.

Otherwise, it's better to upgrade when the prices have started rising.