Combine custom flared-hairpin with text at right edge hairpin

[Dimitris Marinakis]

I need the ability to place a symbol/text at the right edge of a hairpin.

I love using a modified version of the hairpin stencil that allows for flared hairpins that have a niente circle at the tip. (the default doesn't).

https://sourceforge.net/p/testlilyissues/issues/3357/

I've found another snippet that uses a modified version of that code but unfortunately it breaks all of the other cool functions of the script.

http://lsr.di.unimi.it/LSR/Item?id=947

Can someone more experienced with Scheme help me combine them? 

Dimitris