Your Trainer is hilarious. I haven't done rift mage yet (I keep getting distracted by the light saber spirit blade) but force mage in DA2 was loads of fun. Have you gotten Bull's conversations straightened out in your current game? I don't think you can get the romance going officially until after the Chargers mission.
I know what you mean. When I played through the DLC, I went with my first inquisitor, and I'd kinda forgotten how much fun it was being a jedi knight-enchanter, but I can't pass up on your trainer again.
I kinda did. I went from the Forbidden Oasis to the Black Emporium -- changed Kubrie's appearance a bit -- and then back to Skyhold, and Bull was still standing out in the courtyard. D'oh! So I ignored him
and went about all my other Skyhold business, including sitting in judgement on a couple people -- Movran (recruited and exiled to Tevinter) and Alexius (recruited and sentenced to a lifetime of magical research. Oh, the humanity). Then when I went back out into the courtyard, everyone was in their proper places yay! So I went to the tavern and talked with Bull ...and met the Chargers anyway.
Speaking of the Chargers.....yes, I saved them again. I just adore how Bull treats them all like they're his children.
Gatt can just go gatt himself. 
This is kinda why I was delaying meeting them, because I plan on sacrificing them this time
Only so that I can remove that particular "what if..." from my brain and never sacrifice them again.
Now Kubrie and the gang are in Crestwood solving Crestwood problems. Turns out you don't need Solas to recruit Jana; all you need is the Noble knowledge perk (or something) and you can talk her out of joining the wardens. I dunno if Dorian I'm tempted to call him Doorian from now on is happy that I didn't send him back to Skyhold, or disappointed that I didn't send him back to Skyhold. 