Server device type - How to manage vendor SNMP + W2003 monitoring

Dear all,

We have several Dell Poweredge w2003 servers monitored with OpManager, using snmp&wmi.
Issue is that depending of the device type we select :

Type = Dell, vendor = Dell Inc.
Type = Windows 2003, vendor = Microsoft

I can add specific vendor snmp monitor or not.
For example to monitor server temperature (OID .1.3.6.1.4.1.674.10892.1.700.20.1.6), I need to change server device type to 'Dell'.
To add an event log rule, I need to change server device,type to 'Windows 2003'.

This is not convenient, I assume the only way to manage this issue is to allow more than one device type for physical servers, one for the hardware, and one for the OS. (of course, no problem with virtual servers which are monitored as w2003 devices).

Do you have any suggestions ?

Thank you,
Christophe