Your training
First of all, thanks for riding, I just finished chairing the board of trustees and I know how important the ride is to us financially, on training I would add five miles per long ride per week until u get to 45-50 miles, then back it up with another long ride the next day. Interval training might end burning u out or getting u injured