Fun thread! Sorry for the delay in checking in- I just got back from a climbing trip in Joshua Tree where I kept the internet to a minimum.
The pic you posted looks like A. aculeatus. The dark spots on the mantle are "lateral neck dark spots." When the octopus is sitting at its den they can send the same "false eyespot" signal, but they are not what we normally call an ocellus (typically about halfway between the eyes and the edge of the webs on each side).
Just in case you're interested:
Top pic is indeed A. marginatus. There are two color morphs described (and possibly more out there). One has distinct bright white sides of the suckers, and the funnel might not be very yellow. A. marginatus can have a transient blotch on the side that looks ocellus-like, but it's not well defined (more like a uniform purplish thumbprint), and it isn't visible all the time. The purple margins are sometimes not prominent as well. A. marginatus has fairly bumpy-looking skin, the tops of the bumps are pale or light purple, and the grooves in between are purple- this is because the skin is stretched over the bumps and chromatophore density lower (and higher in the grooves). Sometimes there is a dark purple triangle on each side of the eye (if I have time I'll post pics in the next few days). The lines on the arms are dark purple- when they show them- and run only from the base of the arm to the tips, right along the top edge of the suckers. If you have access to an academic library, look at the pics in "Field observations of mating in Octopus tetricus Gould, 1852 and Amphioctopus marginatus (Taki, 1964)(Cephalopoda: Octopodidae)". If not then PM me and I'll send you the pdf. Perhaps most notable about A. marginatus and other members of the genus is the distinctly short front arms (Arms I) and the very shallow front web (web A- the webbing between the two front arms). This group also has much shorter, thicker arms (usually appearing about 1.5-3 times as long as the mantle length, depending on the position) relative to the larger mantle as compared to A. aculeatus.
The pic on the right looks like a young mimic or relative.
And nice A. aculeatus shot of the male stripes! Note the long arms- many times longer than the mantle is long.
Hope this helps!