Just find a radio show for a genre you like on community radio, listen to it now and then - you'll find really good music:
https://www.pbsfm.org.au/programs/list
Or download Radio Garden, and listen to radio stations from all around the world:
https://play.google.com/store/apps/details?id=com.jonathanpuckey.radiogarden&hl=en_AU
OR just stick with your comfort music of 20 songs on repeat.