Switch to Kotlin?
Kotlin has some convincing arguments which make it attractive as the new language for versions 4 and up.
Most notably: No Swing UI
But also the interoperability with other languages, such as JS (I know, I know..ewww JS, but still, it could open the gates for Electron and Quasar as the new GUI9
It certainly looks interesting and potentially powerful