Yes, I think she was kicked down the road, for the reasons you've mentioned. Although it wasn't apparent, at the time, she was assigned to Apollo 25 over three years before the planned launch.
Waverly was Cobb's back-up on Apollo 15, so it likely she'd have flown within a year or two, but, as...