> I encounter far more trouble upgrading gradle and the build plugin itself

Could be time to switch from Gradle to Bazel. It would also be nice to see the last of Apache Groovy, don't you think?