Adrian Mastracci has a good outlook. Having too much money is a nice problem to have. You saved successfully. Perhaps you even over-saved. Having some OAS clawed back is a badge of success. Instead of obsessing over how to pay the absolute minimum possible amount of tax, lose the greed, pay up, smile, and enjoy your comfortable retirement. 
As for me, I'm happy that I'm too "rich" to receive GIS.