Research indicates the lifts with the greatest ROFD are the Olympic lifts. People will argue over there transfer to sprinting but they can’t touch the ROFD facts.
I think what you laid out is fine. I wouldn’t get too caught up in sticking with just those 2 methods. Try to work across the entire speed-power continuum.