I think you should give the "Elite Mariner" type units 2 HP, as they would be more battle hardned, and more martial prowess, compared to those pampered out Palace guards and Nobles. And about the Acehnese, you could let them share the Elite mariners too... but don't forgot to tweak down their morale so they could still defeatable by tactics...