channelmap: adjust RFC3551 channel maps to follow spec more closely