Try a warming charm to you lower back before you go to sleep, may help settle him.
[Warded to Katie] Yay shopping trip! Do you think Olls can handle us both shopping - even if it is for a house?
I bet it is, Oliver is very particular, he always has been, remember those quidditch plays he made us do! You just need to remember that you will be living there too, maybe try sitting down of writing a list of what you do and don't want, get Olls to do one too. That way we can look for common ground between them?