Wow, I really admire what you're doing.
I get that he can't sleep in your bed, but if things don't improve, what about a bed in your room? Even one of those foam kiddie couches that pulls out to a bed? Maybe just hearing you guys in the room would help?
Then again, If it doesn't, there goes any chance of sleep for you.
Good luck, it can't be easy