Hi Dan.
You both did the right thing. There's nothing wrong with joining 'straight in', so long as you accept that, as the one joining the circuit, you are the one who must give way if you come into conflict with an aircraft on base leg, and that, in that situation, the only safe method of giving way is to 'go around'.
MJ
