engine swap won't make it less expensive and faster if the gearing is too low, but better gears will, no matter what the engine - I agree you should dump the BB, and also that the 305 is not a great choice, but a 327 would be appropriate for the vintage, and w/ better gearing give you plenty of power and speed and reasonable economy
Bill