Well, I gave Sprint a call directly and according to them I am currently eligible for the full upgrade and was eligible as of June 1st, which is what the upgrade checker was saying.
Not sure why, cause I was expecting the 9/1 date, but I'm not gonna argue.
As a side note, man was that a pleasant experience with Customer Service. It's NOTHING like it used to be. Kudos to Sprint on that one.