I wouldn't worry about your dogs progress so far, sounds like he's got good foundations and you've gots lots of time to work before fall.
My suggestion for what it's worth;
Start small and work on 1 thing at a time. Don't have huge expectations and try to correct the whole sequence right now...