Yes. They are drained. Otherwise they would rust in the bag.
What fan/shroud is on it now?
What is "not much better?"
You say above it was hitting 180 on gauge with tstat open before. That's normal...with a 180 stat. T stats are junk anymore. I have replaced way more than I should have had to in the last few years.
Did you drain the heater core either time?
Could be lots of gunk in there.
When is it hot? Idle? Cruise? Always?
Does the fan generate enough suction to hold a playing card to the radiator?
Pretty vague on many, many factors/scenarios.
We can all take stabs at it, but need a little more info to be more help.
What's your timing at?
Vac advance?