I don't see why it just stops automatically after a while so I voted for the second option. There's no real reason orf need for stop/start swooping. I don't really understand how swoop can be made more spammy as everyone uses it all the time anyway, unless charging a beam.
I also think it would be nice if swoop didn't automatically turn on the aura, like running. So you have the auraless swoop (a bit slower, a bit weaker but quieter) and the aura swoop (faster, stronger, noisier, have to press the aura button before swooping). It's not like they had melee battles in the show with auras constantly blazing, and it's such a simple thing to implement.