I mean, its getting cheaper with FF cos of fire support. If that helps. Also,
-1 Life Dew
+1 Comp Search
-1 Evosoda
+1 Rare candy
That is all. First one is definitely opinionated, but for consistency (seeing as you don't run beach) I suggest what I have suggested. The second.... Archeops is too...