Well I got an update to 4.1.2, and it actually got worse.
Then I went through all this again, and now it is fixed. Summary:
1) kill email app, flush out it's cache.
2) remove your account from the email app. (i couldn't do this without step 1)
3) good to go.