Separately- is there a reason beyond the "its more reliable than the S1" that you are using an 09 motor? The OMP system is quite a bit different and while it can be controlled it is far easier to use an S1 engine for a flight engine.
In the 40 HP class, you have Aixro Wankel RCE, Wankel Supertec produces modular engines, one to four rotors, able to run on Diesel or JP4, Wankel GmbH offered some, Austro engines has a 294 cc per chamber engine, same displacement as Aixro, prepared for flight. In the UK, aei engines has several, Moeller at freedom-motors shows a whole line, but seems producing none. The site 'Der Wankel motor und sein erfinder' (Wankel engine and his inventor, Google translation always possible), includes a comprehensive list of all Wankel produced and its makers. Blessings +Nice T-shirt ! - there is more than one company in germany trying to revive the Wankel. I am looking forward to the next AERO EXPO in april, hoping it will take place. Usually all these people have their products on display.