You are probably correct on your assumptions. You might as well bleed the brakes first, since that is the cheaper of the two. Check for fluid leaks out of the booster as well. If I can remember these have a check valve in the booster that goes bad quite frequently.