As you said, flashing a different version of Android should be done via clean flash. Otherwise the system and apps can start to act strange.
But the good news are that the OnePlus One build will be upgraded to Q in the first week of february.
See this list for reference: 2021: Week wise OS upgrade and new Device release plan