Actually, I don't think your range numbers sound that bad if you consider everything. Did the 2020 also come with 19" rims? Usually the rating of 402 would be with the smaller wheels, so with the 21" you would expect less than that.
And if you average efficiency is 330 Wh/mi, you are doing...