Just switched to the "Wells" template from the "Momentum" template. The downside is that photos don't have the full page bleed anymore, but the big advantage is that portrait orientation images are displayed without the drastic cropping from the first template. I also think I like the overall navigation better.
I also learned early this morning that the MacBook Pro I ordered May 2 has been upgraded to the newer model just released today. That finally explains the long shipping delay!