I don’t think going back to 3.6 is a good solution here. I was a package for some and Mesa version for others. Also, the featureset of 3.x to 4.x is different. Flatpak users can revert to a previous commit without issed as well. as noted here :
I will be adding the Flatpak update method here in a day or 2 for user who want that option.