My experience of punting in Budapest was quite a few years ago, but I found it much harder going than Prague.
When you say that they charge extra for just about everything in Prague, that much depends on the type of girl/establishment you are visiting and the service. Prague has a lot of commercial privats, where a rota of girls work, and in these kind of places as you say they do seem to charge extra for kissing, owo, etc. etc. From my recollection of Budapest, there were very few of these kind of establishments, and those that did exist were very much tourist ripoffs to be avoided.
Most girls in Budapest seemed to be independents. I seem to recall being charged extra for owo but not for kissing when I visited an indie, but pretty much everything was included when I had a higher-priced escort girl visit my hotel. Which is pretty much my experience in Prague too with independents.
I would have thought that if they are quoting rates, you would at least have got a hint of what services she offers and if there were extras. But if you want a particular service, such as owo or dfk, surely the obvious thing is to ask the girl if she offers it.