I used to run some weird 5.x kernel until I found about collabora and then I still had to cook my own fdt files and patch some weird stuff in kernel, keeping my own local branch, but yeah, it's always the same story with upstreaming, sadly. Been there, done that since OpenEZX days.
But now, I just did the system update, rebooted and got 7.0.0-1 from the package manager, which is never than my x86 laptop. I still have trust issues with this, expecting it to not boot or get up without HDMI output zo.