No worries Dan. I agree we need to raise our match, the other stuff is above par.
You still aren't getting it. A match, no matter how high, is still subpar. You need a B-Fund or a non-elective contribution (NEC). You shouldn't have to contribute a dime to get at least the first 12% or so.