Hi,
Sure, you can use the yellow again if needed. Moreover, the water soluble dyes also dissolve in alcohol. If water base dye is not penetrating after filling the grain, try mixing the dye in alcohol for touching up. Finally, lone wolf, you can always tint the finish top coats. On many of my guns, coloring the stock is not finished until the last coat of finish. That is because every stick of wood is unique and I want a specific color in the end so I often have to work at it. We rarely think about the art of stock finishing because we want an easy rote formula that gives us the same results every time. Fat chance that will happen. In England, stock finishers were a separate trade and likely experts at it.
dave