Probably still to young to be accurate, but I'd say your pretty right on with your guesses. The roo looks to have a 'roo like' tail and streamers starting to develop in his top knot.
RTA: I dont know now... the other one kinda looks a little roo like to me also now that I'm looking at it again. In the last pic of the pullet, the hackles are what clued me.