I almost feel like Thanos being nerfed in the movie likely had to do with "time spent developing Thanos" and "time spent developing the plot/characters" in the movie being at odds. Maybe the verbal acknowledgement by Gamora to Ronin in GGI ("this is one fight you cant win") and Hulks subsequent trouncing by Thanos in IWs would be enough from the ccx stand point of the writer / director?
As far as Thor, I got the impression Marvel was subtly passing the torch from Thor to Captain Marvel in EG when Thor gives her the hard stare and says, "I like this one". Some foreshadowing maybe?
But yeah, Thanos in the comic is pushing sky father level and Thor is well beyond Carol Danvers, save maybe in her Binary form.