You're basically right. If you wanted to differentiate, it would be that Funk has a more choppy beat and is focused more on the music whereas Soul was more focused on vocal melodies.