Has anyone migrated a medium sized codebase from supabase v1 to v2 with Typescript?

We simply typed the request by ourselves (supabase.from<Users>("users")) ... but with v2 and the generated types, it feels incredible tedious and time consuming to type joins (nearly all my queries are joins) - do I miss sth? I'm shortly before going back to v1