Hi Ritfor,
In your case you need to meet both the requirements you mention.
1. Yes, you will need to meet the new financial requirements.
That is, a minimum gross annual income of £18,600 (or the relevant higher figure where a child or children are also being sponsored).
2. Yes, UKBA will have the scope to accept a firm, verifiable job offer or signed contract of employment to start work within three months of your UK return date, provided it's at the salary level required to meet the specific financial requirement.
You must also demonstrate that either you are in employment overseas at the required salary level at the point of application, and have been so continuously for at least the previous six months,
OR
that you have earned the required amount through salaried employment in the 12 months prior to the application.
Hope that clarifies for you.