Hi Michael. Yes, I’m confident of the ID. It has the distinctive triangle or diamond shape pattern behind the eyes which is different from the T.guaneria (Southern Fiddler) which has stripes behind the eyes. ID based on Rudie Kuiter’s “Guide to sea fishes of Australia” p.16. We have photographed many T.fasciata whilst snorkeling in and around Jervis Bay over the years but only once photographed a T.guaneria.
I just checked your two links. It was definitely the Eastern Shovelnose Ray. I have seen many of what I call Banjo Sharks when I have been snorkelling and it wasn't one of them. I swim with the Wobbegongs so you probably see our group swimming between our own buoys. Some of us do swim out to the yellow buoy on a Friday though.