why don't you take care of your 2015 contribution first?
"The earnings are considered earned and received in the year the excess contribution was made. "
it tells you the earnings distribution is considered as 2016 income and you will receive 1099-R for it.
my 2 cents.