My suggestion is to take things just the way they turned out to be right now. Keep your beloved Blad and use it with the 80mm. I carry mine together with an small meter in a bag that previously thougt has enough room for a M6 and three lenses. I was surprised to find the Hasselblad with a normal lens and small a meter are very close in weigth and size everything taken together. I also had a Rollei 2,8f and it don't remember it to be significantly lighter and smaller. It's additional lenses and accessories that turn a Hasselblad into a heavy setup.
If you love to use the Blad, keep using it or you probablyy regret it at one point.