NOt sure THor is badass but GR recent amp has made him really juicy... unfortunately I do not know enough about etrigan. Also Demon/monster slaying is.. thor's thing so yeah as of right now I say Thor unless etrigan can come up with some really good stuff..