+2 . I would wait on the rev2 board is this means a delay of 2 weeks or less.
I understand that you'd do that if it's less than 2 weeks, however thats not realistic. v2 would be made after collecting substantial user experience from the v1 and is not realistically placed in the 2 week release date difference. I expect the v1 release will consist of the most optimal and stable tested version. This practically means that if overclocking would be very very simple (within 2 week release cycle), it would be included in v1 directly. An enhanced version is possible, yet will take longer than 2 weeks. Just my 0.00000002.
Great work Bkk, I'm reading each of your posts with great enthusiasm

I'm not sure what you're referring to by "substantial user experience from the v1" - this seems like more of a software-centric development mindset. Hardware development tends to be much more iterative as designs are assembled, tested, modified, assembled and retested.
I'd imagine that the current "V1" board isn't going to be the "final" board - at least for board manufactures who like to err on the side of caution. I believe I recall that Bkk stated that the board was still very much a work in progress when he released the Kicad project file a few days (a week?) ago.
With that in mind it's likely that the power section could be reworked to replace the current 16A regulator with the 25A part. Which could be mostly transparent - aside to those who've already purchased may boards/parts (Terrahash I'm looking at you) or those who have chips arriving in the first batches purchased from Avalon.
This all hinges of course on the 25A regulator being readily available as well as any supporting components.