This is not important but just so I know: Nappies commonly go under Swashbuckling don't they?
Naps are a difficult one to categorize.
Sharpe, Brigadier Gerard or Hornblower type skirmishes definitely would be Swashbuckling, but French 12pdr grand batteries?
Who knows? Who cares?