Congrats on your great scores!
Context: My situation may be different since I desired the Northeast coming from a Southern school with extremely similar board scores last year (also had USMLE).
That being said, I would apply to more than 20 and have an array of programs that you seek i.e. those you think are shoe-ins, those that are DO-friendly and more competitive, and those that are reaches who rarely have taken DOs. I'm of the mindset that you'd rather be cancelling interviews than stressing over getting the magical number. With the merger incoming, more programs should be mindful of what a COMLEX score is, but that is not guaranteed.
Last year may be an anomaly, but it wasn't rare to read other psych applicants dropping down their lists significantly. Again, you've paid enough for this degree, a few more dollars for some security is my take on it.