Texas Mountain Laurel is wonderful!
For that understory tree, you can use vitex.
It's a beautiful little tree, can be trained as a shrub, has beautiful color & scent, *and*...
it's the leaves that are scented, so when the first frost kills the leaves, you can strip them off & make potpourri!
The fragrance is a kind of spicy/sagey/yummy affair.