I think I still go with Mahomes in hindsight at this point, because a large part of the D's success is based on coaching and culture (team defense) imo.
Even if the D isn't elite in a Bills+Mahomes version of 2019, I think it'd still be at least average if not top 12.