I've seen several times now in various places that if you put your DHA in the freezer and take them frozen you won't get the after taste. I haven't tried it myself so can't verify, but thought I would pass that along!
We moved DS to his own room when I found out I was pregnant. We put a queen size mattress/boxspring with bedrails on the floor for his bed and if he wakes up at night we have the option of one of us going in there to finish the night...
Are you waking up in the middle of the night to pee at all yet? Maybe keep some snacks by your bed that you can grab on the way to/from the bathroom? And make sure you have a snack right before bed!