To eliminate basis, give the custodian "removal of excess plus earnings" before April 5th.
Then before April 15th you can contribute the smaller allowed amount.
@kjungne
