I think that is a vast improvement.  Yes, over 3 hours is to be expected on a full render.  If you change anything, I suggest lowering some settings and do area rendering instead.  It will cut down time.  Or reduce your resolution using D3D Firefly renderer, that will take the load off full rendering until you are pleased with the results.  I like the results so far.