"as"

If I am using "as" as both an adverb and conjunction, where should it go?

The octopus fought on the shore as monkeys do.
or
The octopus fought as monkeys do on the shore.

The second one follows the adverb order (manner, place, time, purpose) while the first one has no ambiguity at all (whether the octopus or monkey is on the shore). And if it's the first one, should there be a comma before as because it's messing up the adverb order so it'd read like this:

The octopus fought on the shore, as monkeys do.