The only change I'm considering really is cutting Amande. My main issue into luffy was opening into too many 2ks that are too valuable to actually play.
May take them out for 2 more brulees and a krieg for the saka matchup.