The latter is easy to correct by upgrading to any water pump from '65 up, (picture #3). The other problem was more difficult until now. We've modified our very popular one-piece stainless bracket to stand alone and support the alternator without the block.