The May/June service change (no boats going to DHS) ended by June 30 and they now run from Epcot to DHS with the 3 hotel stops in between.
Unfortunately, the announcement of the DHS service interruption did not include an end date, so it has been a confusing topic.
And for the WS Friendships..they only make sense if you are using them for a lunch ADR.
(It would be great if the eventual Illuminations replacement allowed for full WS boat service to operate during evening ADR times.)