Me too Pepper

I thought that I could see the flanges of the rear cell in your first picture. I didn't realise that it was the lens cap I was looking at.

So, it looks like you got it right first time! Possibly a little bit too far back, but as I haven't got a dew strap, I'll leave others to make more specific advice.

Art