Stimulus for dependents: infant and 17-year-old

I have two children. One was born in January and the other is 17-years old. As it stands, I believe neither will receive a $500 stimulus payment.

1. My 17-year-old son earned a few hundred dollars last year. Would it make sense for me to amend my tax filing to not claim him as a dependent, have him file his own tax return, and him get the full adult $1700?

2. Is there any provision made for the newborn (I heard if she is on next years' tax filing I would receive the payment with that return?)