I'll handle this - just wanted to put it here so I don't forget.
Basically the fact we default to ec2-user & ubuntu is fine, until you want to use something else. Having to type --principal multiple times is annoying, and I'd much rather configure it.