I would remove and re-create the email account - Ensuring you are always using IMAP/SMTP and never POP3. With a true IMAP setup, any changes you make on your device will be synced back to your yahoo. Make sure Sync is on.
Alternatively, go into yahoo and setup forwarding to gmail, log out of...