I wrote a BIP on discovery to go along with BIP 36, just never submitted it: https://en.bitcoin.it/wiki/User:Justmoon/BIP_Draft:_Custom_Service_Discovery

Since I'm busy with other projects, if anyone wants to take up and/or finish either of these, please do!