Jumping in the AM5 platform

Hey everyone,
I am currently running a GTX 1080 and an i5 6600k, I am looking forward to upgrade the CPU as the GTX 1080 is enough for my gaming needs at the moment. I don't have too much money to spend on a more expensive CPU and I just want to upgrade piece by piece. I was looking on getting a ryzen 5 8400f as it is the cheapest AM5 option .I want have upgradability options in the future when I upgrade my GPU and I think it will not bottleneck my GTX 1080.
If I am considering this sort of jump should I just wait for the next line of CPUs so it will get cheaper or jump right now, because I don't think they'll get much cheaper than this, or are there better options to do this sort of jumping?
P.S
I do not live in the USA so I do not have options that might be available there, and I would be thankful for Motherboard and RAM recommendations