Will you be using EMH? If not i would chose Courtyard. We just stayed at PPH and if i was booking a future reservation i would book Courtyard if it was significantly lower priced. If staying on site we prefer DLH.
Disneyland Hotel.
Just want to add-in an opinion from someone who has stayed at both properties.
Lame. I stayed there almost a year ago. Motel noise. I’ve stayed there many times. A former fave. But I’m too old to deal with that style room now.
We usually stay at homewood suites convention. 
This is actually the single biggest drawback of staying on Harbor. You may end up squandering your magic morning waiting on bag-check. So definitely don't bring bags and snake your way up to the front (in the center, there is a dedicated "no-bags" line). Don't worry about stepping outside of the pylons, get past the crowd-with-bags, and then get back into the middle half way through for the no-bags line.
Since the expansion and improvement of the Harbor bag check area earlier this year, the experience there has been greatly improved. Notice the lack of "I hate the Harbor bag check" threads here lately? Things move much more quickly there now -- generally, the Harbor bag check is much more efficient than it used to be.
I guess there may still be some rush hour pile ups (depending on when you go). It was a Fall Break Monday morning this month on the 7th when we experienced a line that stretched to the entry gate on Harbor.
