Yeah, Mayfield really is a better version of Finn.
I had high hopes for Finn going into TFA and while he was still my favorite of the new protagonists, it was all downhill for him after the janitor joke. TLJ completely and utterly wasted him and by the time TROS tried to give him a little dignity back, it was way too late.