Yeah clay is the way forward in my opinion, I find once it's clayed, if you use a good wax/polish and sealant, it's second to none, the finish is like glass!
It's amazing how clean your car feels afterwards.
One bit of advice...don't drop the clay!! If you do, don't even consider using it again, you might do more harm than
good.