Update:
Replaced the mass air flow sensor, and after about a week of driving around, I retested the MPG again, Now seeing an average of 13.8 MPG with 40% highway / 60% city driving.
So I guess headed in the right direction, but still shy of what I believe should be the average MPG of around 19.