Just wait until the change has been confirmed and you know the date from which it is effective. If it turns out it affects you then either change your ticket or get a 60 day tourist visa. You may also be able to get a 30 day extension, in which case your ticket is still useable; to travel into Thailand you can get a temporary onward ticket for about US$14.
The fact that you are staying with your long term girlfriend in her home doesn’t actually look like tourism! I do it too but I wonder if they will use this to deny entry sometime.
It’s not so crazy. Most countries restrict work for foreigners. Some have reciprocal agreements for working holidays, usually limited to certain age groups, but it usually requires the appropriate visa.