Maybe. (And I think it would have been better left at 16.)
But the Fish/Dollmaker arc seemed like a completely different show. Now Jada (and therefore Fish) is off the show, so we won't know at least until she gets around to returning as a guest star at some point.
Anyone notice if the people with Fish in the warehouse were her fellow escapees from Dollmaker island?