In-country Tier-2(General) to ILR - qualification date?

[DSK12]

Hello,
I will qualify for ILR (5-year route) shortly and need some guidance to see If I'm calculating the qualification date correctly.
I have read the http://www.immigrationboards.com/indefi ... 99638.html but it appears to be mainly geared towards applicants who have had a out-of-country Tier-2 leave to remain.

My case is this:
I was on Post-Study Work visa when my then employer sponsored my Tier-2 visa.
The date of issue on my BRP was 23-Aug-2011 but it had a spelling mistake in my place of birth on the back of the card - on the same day I contacted UKBA who were going to fix the issue and send me a new BRP - the date of issue on the new card was 15-Sep-2011.

Question#1: Am I correct in using 23-Aug-2011 as my start date to calculate my 5th anniversary?
Question#2: If 23-Aug-2011 is indeed the correct start date, I have calculated the earliest date I can apply for ILR is on or after 25-July-2016 (planning to make an in-person application at a PEO).
I followed the calculations mentioned in page#19 in https://www.gov.uk/government/uploads/s ... ds-v13.pdf - but would like a second pair of eyes to verify as I plan to apply on 26-July-2016.

BRP issue date: 23 August 2011
5th anniversary: 22 August 2016
5th anniversary minus 28 days: 25 July 2016
Planned in-person application date: 26 July 2016
.................From...........To......
Year-1: 25 July 2016 26 July 2015
Year-2: 25 July 2015 26 July 2014
Year-3: 25 July 2014 26 July 2013
Year-4: 25 July 2013 26 July 2012
Year-5: 25 July 2012 26 July 2011

[DSK12]

Please can someone comment on the above questions.

[CR001]

Date of Tier 2 visa issue is the date you count from, so if that is 23 August, then yes, within 28 days before that is fine.