Just wondering... why use a water-based stain? 'Cos that's what you got?
For an oily wood, wouldn't a spirit-based stain be better? Should still wipe the job down with thinners/acetone first, though.
(You can still buy them, can't you? FWIW, I don't mean these 'orrible stain/ finsh combos that seem to be popular now... just a plain ol' spirits-based stain.)