Amiga 2000

[Iggy]

Like almost everyone else, I'd favor making the A2000 your primary machine.
They are more easily expanded than the A500, and they are nearly bulletproof.
Your PSUs cooling fan is definitely going bad, mine is quite quiet.
They '030 card you have is nice, I only have an '020 processor.
About the only option that you don't have (that I would want) is an RTG video card.

[Iggy]

Yes, AGA is nice, but I upgraded my OCS A2000 to ECS and with a good RTG card I've got two decent display options.
As games aren't my primary interest (not that you can't get plenty of OCS/ and ECS games), I don't really miss AGA.
If I had a spare $200 I'd buy one of the Picasso II cards previously mentioned and set up a second system.
A2000s are still plentiful and fairly cheap, something that can not longer be said for A1200s.
And they are built like tanks.
Nice to have a detached keyboard too.