Sounds like I need to get a bottle of the 3M plastic cleaner that you recommend...if the clean, polish wax routine doesn't pan out.

I used to have some polish (forgot the brand) that I used to clean and polish the rear window in the convertible top of my Miata (which wasn't made of glass). That worked well. The product would remove scratches and swirls from the plastic window.