Oh Michelle, I am so sorry. While I've never had a stone, I have had a HORRIBLE bladder infection. So I know how annoying and painful that is.
I hope this all "passes" soon and you can get back to normal.