Q: Do I use "add4" if there as also a 3 in the chord?
A: sure. actually 'add4' tends to mean the 3 is also there. otherwise it's called 'sus4'