Both movements are interchangeable. The date wheel doesn`t add any height, trust me I know about these things!
The 'ghost' 1st position on the crown can also be modified, changing the setting lever spring for a 2801 variant will get rid of it. Clearly a job for a watch repairer who's skilled in the art, don`t try this at home if you don`t know what you're doing.