I think that spaying/neutering Puck will help- it sounds like there is a mental battle for head of household going on.  Bunnies are smart and it sounds like you vs. bunny.

I also think that maturing even after the spaying/neutering will help too.  Once bunnies are past the baby/teenage stage many bunnies often seem happy to settle into a schedule/routine.

I would try getting him back into his cage with treats- rattle the bag and when he hops in he gets a treat.  Also for a while make Puck EARN all treats- he doesn’t get a treat unless he comes up to you, lets you pet him, lets you approach, etc.  Make him associate the awarding of treats (soemthing he likes) with the behaviors (positive attention) that you like.  You can even cut the raisins into smaller pieces- bunnies are smart- but they are more likely to associate positive with more treats rather than larger treats.  If your girlfriend gives treats a lot- have her cut back to make sure Puck is not getting too many.

I raised one bunny from a youngling- and she seemed to go thru a “teenager” stage where she wanted to do what she wanted to do, was territorial and seemed like a human teenager who thought she ruled the world and what she said goes.  But she has matured out of that a lot- I think spaying helped trememdously, but I think it still took her a few months after to mature mentally and mellow a bit.  Now she is smart without being so defiant- she does not seem as quick to resort to naughty behavior to get attention, she seems to enjoy being found “thinking” about doing something naughty without actually completing the naughty behavior. (Sneaking upstairs, moving barriers, etc)

Oh let us know how the big ‘snip’ goes!! {{VIBES}}