@tnick I know this is an old post, but if it helps you - I've created support for STM32 based on latest STM32duino here. It's currently made to be backward compatible for the existing STM32F1 support, which is what you are struggling. But with a small change you can use the new STM32 HAL support. Let me know if you are interested to give it a try.
The longer term plan is to remove the existing (old) STM32F1 support in favor of the new and more general STM32 support. (If @mfalkvidd agrees ;-))