I always do the extra content stuff before going to whichever game's point of no return, excluding bonus character stuff that I just weave into the normal playing. I guess it doesn't really matter, but I like to do all the stuff I can before the end of the game.