Agni and Viv do need more companion content. Even though these two are some of my favourite companions I do kind of forget about them when I start new playthroughs especially being so late in the game compared to Cait, Brienne, Ryn and Arona.
I know Cait is a favourite (still now sure why apart...