Oh absolutely, their duel should absolutely be reminiscent of the dynamics of the Music, but in a more concrete way, now connected to Arda and the parts of the song that have transpired. Finrod also consistently seems to be very good about understanding and using other people's language and music, so he isn't badly prepared, but Sauron knows how to pinpoint weaknesses, exploit hubris and deceive/twist. They have a bit different motivations and methods than eru and melkor, but the way their songs interact seems similar.