Regarding to 1P+N and 2P, Although the mechanisms are not the same but you can used 2P instead 1P+N because when ever you use 2P you can connect Line and Neutral interchangeably, if it's 1P+N you can't interchangeably.
Therefore, you can use 2P device , Cover 1P+N.