I think there are too many restrictions to do with the potions. You could easily make it work still if you let the FIREPROOF potion be applied on non-Surf Pokemon, what would the real difference be? You still used SURF on the cauldron. Just cut down on the unnecessary complicated bits.

As for ledges, have you tried making an object on the same level as the player (so it cannot be walked on) that if you press the right arrow key teleports you to the right of the ledge?