Yeah, about the only thing I can think of to help with the "follower rushes ahead" is to use AFT to make my follower an archer. They usually don't melee with a bow. Usually. XD
Just don't get in their way or you risk a piercing headache.
Otherwise, your idea is pretty much the best thing you can do. Fire your bow, then switch to melee weapon and rush in with your buddy.