I'm curious about the pre CPL you mention, is this part of the 25 hour course and included in the price or is it an extra?
Anyway, good luck, I recently finished my CPL, it's hard work! especially if your trying to do it in 2 weeks!
incidentally the point you make about hour building is very relevant, if you waste your time whilst hour building it will cost you so much more in the long run by making your CPL far more expensive. being up to speed with nav, MDR, holding precise headings and alts, practicing PFL's, etc will save you time and money on the CPL course.