I think the DF is too late, I personally don't do one, but my understanding is they should be between 10 & 11pm to work effectively, so yes I would bring it earlier.
Also the fact he fights for feeds, I would try stretching it out, he sounds like he is "snacking" which will cause night waking as he doesn't take a big enough feed to have some "saved" up for at night. He sounds very much like my ds#1 in refusing one side (probably slower let down than the other) I always offered the 'prefered side first for a minute then switched to the other side & then back after wards (& pumped the rejected side after the evening feed- 5mins past empty) for about a month & that helped him to nurse effectively on both sides.
I also think the early wake up is part developmental as my 4.5mo does itsome of the time... as he goes from about 7.30 to 3/4am (I don't df) I tend to just feed him (maybe not needed but it works for me).