Need help deciding what scope to buy with a given budget

[glowman]

I need to buy a new oscilloscope for the following needs:
1. Troubleshooting/tracing signals mostly from switching PS or industrial equipments.
2.  Occasionally, design some high frequency power devices.  (<5mhz) and usually needs just 2 channels
3.  Been using Iwatsu analog scope and not so much familiar with DSO

Considerations:
1.  Want to buy something that is around 100mhz, hopefully 200mhz DSO that does not go beyond USD1600.  Best bang for the buck for that budget.
2.  I know my needs are just on low end DSO but, want something with a little future proofing.  Want to avoid regretting later why I did not get the higher one.
3.  Frustrated with reading about bugs found on Rigol/Owon/Instek etc. China scopes so, considering to buy Agilent DSOX2102A (since they currently have promo of getting higher bandwith for price of lower bandwith).
4.  Or I might be wrong, China scopes are better than the Agilent's.  Bugs still prevalent in Agilent's

Hope someone can help.

[electronics man]

There are bugs in all scopes. And consider the rigol ds1000z or ds2000

[echen1024]

What about a Hameg HMO?