My goodness u r still in your current company despite all our advice.
You are not asking for career advice. You are asking us to validate your decision to stay put.

Yes, you should stay put in your current company and wait. Period. End of story.