I hope he stays out for good. I always preferred him as a loner and a bit of an outcast. When he is with the Avengers, he just stands around waiting to be upstaged by Luke Cage or Hawkeye.
A team-up used to be something cool, but now that everyone knows each other's identity and are friends, it isn't as special. I like Peter on his own, maybe with a couple of solid friends like Daredevil.