I'm ready to agree with the basics you've got in the Working Draft.
So, what would you like to do with the spines, the usual spiny defense, as used in out Dacentrurus conversion, or do we allow for it to employ them offensively like the Giant Porcupine Fish?
Creature Catalog said:
Spiny Defense (Ex): Any creature that hits a dacentrurus in melee using a handheld or natural weapon (but not a reach weapon) must succeed on a DC 13 Reflex save or take 1d6+6 points of damage from the creature’s broad spines. The save DC is Dexterity-based.
Spines (Ex): Any creature striking an inflated giant porcupine fish with handheld weapons or natural weapons takes 1d6-1 points of piercing and slashing damage from the fish's spines, and expose them to the fish's poison. Note that weapons with exceptional reach, such as longspears, do not endanger their users in this way. A giant porcupine fish may also use its spines offensively.
Which translates:
#1 Spiny Defense (Ex): Any creature that hits an aetosaur in melee using a handheld or natural weapon (but not a reach weapon) must succeed on a DC 12 Reflex save or take Y points of damage from the creature’s broad spines. The save DC is Dexterity-based.
#2 Spines (Ex): Any creature striking an aetosaur with handheld weapons or natural weapons takes X points of piercing and slashing damage from the reptile's spines. Note that weapons with exceptional reach, such as longspears, do not endanger their users in this way. An aetosaur may also use its spines offensively.
Or we could combine the two into a save-avoided spiny defense plus a spiny offense:
Attack/Full Attack: Tail slap +7 melee (1d12+6) or bite +6 melee (1d4+4) or spines +6 melee (1d4+4)
#3 Spines (Ex): Any creature striking an aetosaur with handheld weapons or natural weapons must succeed on a DC 12 Reflex save or take X points of piercing and slashing damage from the reptile's spines. Note that weapons with exceptional reach, such as longspears, do not endanger their users in this way. An aetosaur may also use its spines offensively.
An aetosaur doesn't have many spines, but their pretty big and pointy, so I'm leaning toward option #3.