Hi
They will calculate your work experience when you accept your ITA. I would suggest you to accept your invitation somewhere around 2nd week of August. Also, make sure you are absolutely ready with all your documents at that time and explain this in your LoE
All the best :)