Sounds like you've managed to address the first issue, but without a sleep study it's impossible to say for sure whether you've addressed the second problem.
Most apneas typically occur during REM sleep, when muscle tone is at its lowest and airways are more likely to collapse. If you frequently wake up during REM (even if it's a micro-arousal), your sleep architecture is broken.
It boggles the mind that sleep apnea severity is diagnosed on number of events (AHI) without considering when those events occur. Maybe you have an AHI of 3, but if they all happen during 2 hours of REM, you basically wake up 24 times during REM, which sounds a lot worse than 3 events per hour.
Sauce: have sleep apnea, hate the machine, but have learned to live with it.