Hey @langstonsmith!
I'd say we're done with the major refactoring; the MapFragment interface is pretty stable now. Of the pull requests you see there, only #2776 touches MapFragment; the rest are behaviour changes above the MapFragment level, which should not affect your work.
Here's the latest MapFragment interface, which is just pending QA; I expect it to be on master by next week: https://github.com/opendatakit/collect/blob/568823acbc2a6027863063aa09cb4b988bc38424/collect_app/src/main/java/org/odk/collect/android/map/MapFragment.java
Can you help me understand what steps you have left to do to finish your work? If there are any concerns that are holding you back, I'd like to address them promptly so you can proceed.