It looks like there is some overlap between Epicurus and Aristotle. As far as the third category (of Aristotle), that is addressed by Epicurus in Letter to Menoeceus which recommends to practice together with others.
The following article covers Aristotle's take:
Aristotle On the 3 Types of Friendship (and How Each Enriches Life) | Philosophy Break
There is not one type of friendship, Aristotle argues, but three. The highest type – the friendship of virtue – contributes most to our pursuit of the good…
philosophybreak.com