I'd probably take the bus to AKL and then get the DS bus there. Not sure it matters to you, but there is a direct bus from Typhoon Lagoon to DS - DS is a transfer point for resort guests taking Disney buses to TL. Perhaps that water park would make things easier (but might not be your first choice!).