I'd stay with the holster you have. It has good retention and looks professional. If you start carrying with a Supertuck (NO RETENTION), I fear you're going to have troubles if you go into a restaurant and "Virginia Tuck".
You might have to change your clothing style and just wear a T-shirt with a loose outer shirt, preferably one with some sort of print pattern on it. That way if you must uncover, you can just remove your outer shirt and you're still go-to-go without any "grey" legal or retention issues.