The problem for you in that link at #160 is that every example Griggs gives of an alternative word for "yom" that Moses could have used in Genesis 1 to mean either "a continuing event from long ago" or ambiguous time" would also apply to Genesis 2:4, in which you've conceded that "yom" is figurative and not literal.
Griggs doesn't address Genesis 2, so you're left with making an exception in chapter 2 for the Griggs' rule you're relying on for chapter 1. Doesn't seem like much of a rule.