In the end i mamaged to find a very old but complete backup with v.0.15.
Restored it after wiping system, data and Boot partition, updated ota to v.0.18 and restored my data backup after wiping only data.
Soo happy to be back on status quo and not having to install everything again from scratch.
The only thing is i still wont receive the ota upgrade to q
Anyway one day of work for nothing