Hi Andrea,
Sorry I don't have any advice for you - but I wanted to symphathize since we are in a similar situation. Right now I am willing to do anything to get a goodnight's sleep :-(
I am trying a bunch of different things - Giving less solids; Shh/Pat; Reducing daytime sleep (This will be a last resort) - I will let you know if something works
Good luck