I 've done the same...I just cancelled my i5 MBA order and placed the 2020 Base MBP 13" adding 16GB of ram. I know its 8th generation but its the new keyboard and looking forward to it. My 2016 13" MBP was one of my favorites for a few years of use.
But with 512 gigabytes
Too many complains about the mbairi5 . My late 2013 13" MBP was my favorites for seven years of use.
I have hesitated with the 10th generation but way to expansive for me and with no wifi6...So i decided to be "reasonnable" even if it's still a cost !