Looks like you went with #2.  I'm a little torn myself, but let's go with this for now and see how it plays out.  If the default bundle is too large and is making performance suck it might sense to go back to #1.