Yes, it's true GraphQuery can be quite a task to maintain. It's something the team is aware of and would like to improve in the future, though it's not in our roadmap right now.
Here's a workaround I offered another user where you can do 2 queries and merge the data so you don't need to keep updating the GraphQuery (It's tricky, but might save you time in the long run):