Pretty good piece, but it assumes a rather gentle entry, if we assume, say, Monastery Beach, CA then these two sections are inappropriate. Especially the bolded areas.
Surf Entry – Get to the waterline and watch the surf. With your mask around your neck and fins in hand (with straps already adjusted), wait for the lull in between sets to make your entry. It is important to get out of the surf zone as soon as possible. Get to about chest deep water and turn to face the beach and use the Figure 4 to put on your fins while keeping an over-the-shoulder eye on the surf. Stay close to your buddy during the entry. If one of you is having a problem, the other can help stabilize while fins are being strapped on. Pro Tip: If you are bringing a camera or a·dive light that won’t fit into your BC pocket, clip it!·You might think you have an iron grip, but even a moderate three-foot wave can prove you wrong.
Exiting the Dive – On your way back in from your dive, make sure to surface well before you reach the surf zone. Inflate your BC and swim toward shore while watching the surf. Gauge the sets and get a feel for when the next lull is going to occur. When it does, stay close to your buddy and swim for the beach. When you get to chest deep water, remove your fins and quick-march out of the water, keeping an eye peeled over your shoulder for any breakers looking to sneak up and embarrass you.
------------------------------------------------------------------------------
In severe beach breaks you should put your fins on before entering the water, enter solo, snorkel in your mouth, time your entry to the break and get out beyond the break as fast as possible. Go under the waves if you need too. Then your buddy should do the same. I've watched two many buddy pairs smashed into each other to suggest any other way.
Exiting is the opposite, I'd recommend snorkel in the mouth, BC deflated, body surf in on a wave and when your hand and knees contact the bottom, crawl out of the water as fast as you can. Then you buddy can follow, using the same procedure.