Yes, I ended up with H.riparia as well. However, the keys do favour that species, so I am always hesitant to the use the name. It is a taxon that has undergone many, many revisions so it is also possible that the name no longer applies to the plants previously called "hibbertia riparia" at this location, and that's assuming we are correct in the first place!