As Rob1519 mentioned to you back in 2014 when you were asking similar question for your S1 warranty claim, "If you want ... ask. Possibly you could pay a little to upgrade your upgrade.".
Did you have the chance to ask Cervelo directly back then? What did they say?
Seems you've been claiming warranty almost every 3 years. Hope it works out.