I do not believe we will see anything other than you have already mentioned. The iPhone will be introduced in September and I do not believe we will see anything further after that.
I wouldn't be surprised to see refreshes of the MacBook Pro and iPod lineups. A new Apple Watch, MacBook, iPad, or something that doesn't already exist is a pretty far stretch.
It's hard to know for sure but I wouldn't expect any huge feature rollout we don't already know about. We'll have to see what functionality is added in September with the new iPhones.