Sorry to tell true to you. Considering your situation only allowed solution is to stay with STOCK rom.
Google is the master of the rule and it is up to them to block or allow. It is a pain for everybody now but we have to accept.
So there will not be any solution to this in future updates?
Is it enough to go back to stock or do I also need to lock the bootloader?