I was in similar situation. I recently purchased MacBook Air 13 inch 2017. I didn't buy MacBook Pro due to reliability issues with 2016/2017 keyboards. Just do a quick research in here and you will see what I mean.
As far as air, screen is just OKAY, otherwise it's a great machine that offers better ports selection and will definitely last you 3-4 years.
You can get July MBA 2017 Refub for $800 on apple website, mine came in brand new box, packaging with no sign of usage.