So, I've found a few options for whale watching and Golden Ring tours.
I think this is the whale watching we'll go with unless I hear from someone here that it's awful - http://www.whalesafari.is/whalewatchingclassictour/
or one like this with a stop to see the horses and get ice cream :-) https://www.extremeiceland.is/en/destinations/the-golden-circle/golden-circle-iceland
Thoughts appreciated! Thank you!