XHTML 2.0: Allow <address> in <p>

Hi.

I found myself trying to find an appropriate way to mark up sth. like this:

"He lives in <?>5th Avenue</?>"
or
"You can call us under <?>0400-MARKUP</?>"

where the ? is a tag that should mark any kind of address.
HTML 4.01's <address> has some very heavy restrictions for using it 
inline, so I was hoping to find this improved for this purpose in 
XHTML2.0. Well, there's just one little obstacle for using it in the 
above way: You can't include it in <p>s.

Best regards
Manuel