Yes mate i would suggest that as well.
I don't have any experience with the bebop2, but the 4 bebops that i have owned (2 were sent back and replaced by parrot) have not been particularly reliable to put it bluntly.
They have a tendency to disconnect from the app and lock you out of the WiFi...