My case is a little complicated, please try to bear with me and follow along

I have a 2010 Cooper S. In 2015, my engine died at 61k miles and was replaced thanks to my extended warranty. There are about 43k miles on this new engine (N14 i believe)

In December, my car went into limp mode (it was a one time problem and my friend who works on cars couldn't find anything specific wrong with it.) The codes that were coming up on his scanner were vague but pointed to a misfire - everything was running normal since. Then, a few weeks ago, after getting gas, my car wouldn't turn on. I waited a few minutes, it started without a problem and it's been fine since. No more start issues. My friend had said it was easier catch when it's failing, otherwise when it's running perfectly, its a bit of a guessing game (although he was already suspecting it was HPFP issue.)

Fast forward to yesterday, I turned my car on and the check engine light came on and I noticed my car shaking/vibrating a lot. It's in the shop now and i'm waiting for updates, but we are thinking its the HPFP. From what I have read, it seems mini has extended the warranty to 10 years/120k miles for 2007-2009 models. (Of course mine is a 2010!!)

So I have a few questions:
- When my engine was replaced in 2015, would the HPFP have been replaced with it? If so, would it be covered under the 7 year/70k miles warranty?
- If not, does anyone know if there has been any extension to the 2010 models with this warranty? I read someone's 2012 was covered so i've been crossing my fingers about the 2010.

I apologize if this is confusing, but if you've been able to follow along, i'd appreciate any input or advice.
Once i find out for sure if it is in fact the HPFP, i will call mini but I just want to make sure I have some valid arguments