Never fly 'up wind' whatever the situation. There is no conflict between joining traffic and circuit traffic merely a situation where there is a need to fit in.
How you fit in depends on the circumstances and the aeroplane types involved; their respective speeds and positions in relation to the runway and your own handling skills. There is no one answer.
If there is full ATC they will have a say as well!