Yes, if and when these forms do come out and yes the current PND 91 and states at at top of the form "Income from Employment in Thailand" or very similar and one would use PND 90 and also do not forget the Income Exemption/allowance form too.
We shall see but again the local Revenue office with my circumstances that I do not need to file as under the thresholds.
Yes, wait and see and if you have PIN you can use this.
There again yet again no clarification on anything!!!