I think you are very smart to realize how important it is to get in shape before your surgery. I too am very athletic. Even tho my bad hips were starting to interfere with my athletics I was in good physical condition in general before I found out I needed 2 new hips. I had a 2 month wait. I worked my butt off to get as strong as possible before my surgery. It paid off big time as I set all kinds of records at the hospital for getting back on my feet and out of there!!
And I continued to make wonderful progress in returning to my active life.
I would suggest you concentrate on getting strong. I backed off my cardio and really started hitting the weights. I also backed off stretching (yoga) to let my muscles,tendons, ligaments get a little tight. I worked my whole body, but really made sure to hit my core and upper body. You want to try to be as lean as possible too. With your background, you should have no problem coming up with a good routine, or do some web searching for sites with workouts. I really like using an exercise ball instead of our bench for the added core workout. Sounds like you have just about all you need to really get strong. Maybe some resitance bands.
I also hit the pool up a few times a week and did hours of pool running as well as leg/arm workouts in the water. That was the only 'running' I was able to do then. I was so buff by the time my surgery came around I could have entered a body building contest!!
I don't golf, but look at Jack Nicholas, the poster boy for Stryker THR!! I know of several golfers with THR too. I can do just about anything I want now too as long as I watch where my knees end up!
Congrats on the upcoming baby! good luck,