It’s an unpopular opinion, but I personally like the ending and think “Mad Queen” Daenerys was heavily hinted at throughout the series. But I know a lot of people dislike the ending, and I know it’s not for everyone.
Me personally, don´t think this is a necessarily bad ending (except bran as king), it is how it´s done (storytelling, plotarmor, pace and of course things like “daeny kind of forgot about the iron fleet”).
Your suggestion could work, but what to do about major side characters like varys or littlefinger? It is tough to integrate them without beeing killed, they would become just background characters.
The night king could be killed by bran, also. @almightycutie did a fairly good approach on this in his “GoT Redeemed” edit by simulating the nk breaks aryas neck and bran pass into her to let the dagger drop and to stab him.
Also removing plotarmor for jamie, sam, brienne. He edited these faces and aryas into the funeral.