I'm in a similar position to LEE - my SON wheel needs a new rim and I'm debating whether or not to rebuild it in time for PBP. Also I'm not generally very happy with the IQ Cyo I've been using - very temperamental, possibly faulty, so I'd be looking at replacing that too (would be a good excuse to upgrade to something like an Edelux, I guess).
Anyway, I got to wondering how to quantify lighting needs for PBP. Looking at sunrise/sunset times and doing some back-of-a-fag-packet sums factoring in sleep time, I reckon I'll need around 25 hours of light. Does that sound right?
Also, how much light do you actually need? The possible alternative to the dynamo setup that I'm considering is a Cateye Volt 700. If I can get away with using it on the low power setting (100 lumens) most of the time and keep it topped up using a USB power pack, it may well be sufficient.