Im keeping it 15 weeks. Like you said 2 weeks isnt that much of a difference and from what ive read its best to run EQ for at least that long. Also weeks 13-15 im upping the dosage of test to 900mgs a week.
There's now way you need that much gear for your second cycle with your stats.