I second the recommendation that you need to register within thirty days. I qualified under last year's program in late February and contacted Customer Service in March and was told I was out of luck, they could not help me as thirty days had passed and I had failed to register. When I pointed out that I was under last years rules they were like, Oh, you're good.
So be sure to register before thirty days runs out. Whether you get 30% or 25% during the overlap I can't help you. Just be sure you get one or the other.