How are you feeling at the end of the 30 miles on Sunday? If you're feeling good, I'd say you're pretty close on training. I would taper the week before the ride.