scotman, what's wrong with the bokeh you are getting? Every lens has boken, and the shape and feel of it depends on the physical build and design of the lens. Some bokeh is very smooth and circular, and some is more like a polygon (lenses with lower blade count in the shutter.
When did you buy your M2? The M2s that are shipping now (since last year at some point) have an upgraded ground glass. If you have the current type, changing it might not help you. I don't believe Redrock sells the older styles, but they do sell the newer ground glass as an upgrade if you have an older M2.