You're well before the filing deadline, you can just file the amended return and invalidate the old return. Your honesty will save you a lot of grief in the long run; they seem to like to go after people who can't defend themselves easily ($).