I don't have any advice, only can say that your description sounds about right for the long relationship you both have ahead of you. Here's what I picked up from my experience:
Don't give in and don't accept the behavior. Man, even my kids get sent to their room and we've been on that for a lot longer than 12 months
Don't get down on yourself. You and the rest of us in the 99% that have trained/are training their own dogs are the biggest limits to our dog's potential.
Don't forget that the dog can't "act like you've been there before"..... if he's never been there before.
You've got about 10 years left on your relationship, think long term, not the last 10 days.
My lab saw improvements each year with her peaking at from 4-6 years. Her last retrieve is still one of my favorite memories in life: a redhead sailed a loooooooong azz way, then died and drifted to other side of slough, we picked it up on our way out: blind water retrieve, all on hand signals... she wouldn't deliver to hand, she carried that bird 1/4 mile back to the truck.
As much as possible, try to think "obedience is team work, not compliance". This will especially be important when the weather turns to chit and that dog is swimming in 33 degree water struggling to get back onto an ice ledge with a bird in it's mouth..... and then gets back to the blind and might not be that inclined to give a rip if you're pissed about something
Keep working on both your and your dog's skills. Keep it fun. If you don't, you end up like one of "those guys": where everyone on the slough knows your dog's name from you yelling it over, and over followed by a false command like "...get over here!" "Bucky, bucky, BUCKY! Get OVER Here!"