I am also in the market, and replacing my small/compact Moto G4 after 7-8 years. Sansung A54 seems to be the most appropriate replacement, based on my criteria.

I just looked up the battery replacement procedure, and it is not horrible for something you want to do once after 4 years.