I think those two songs fit better on the EPs ... as they're different than what the album sounds like -- which is more in the vein of the singles.
I think I like how juxtaposed a song like the Bon Iver-esque 'Me' could be next to 'Chocolate'
I'm interested in hearing the self titled song. That should be weird. Although 16 tracks is a lot to take in, wonder how long it's going to be.