Hi Stw,
A couple of things to consider.
First, i would say that if you have to ask our opinions then you are not totally convinced to change bikes in your own heart.
You originally wanted the HP4. Understandably it didn't do it for you, now you're entertaining the thought of the Ape.
IMO from what you have said to date in this thread, you are running away from the 1199.
It's really just the dash issue isn't it?
I think most of us here have got that issue running through our minds if we are honest.
Don't forget that DUCATI are on to it, and have been from the start without hesitation.
They had problems with the early 1098 dash if i remember correctly. It got sorted.
I don't know where the replacement cost of the 1199 dash being $2000 came from. You probably should talk to your dealer regarding how much to replace it after warranty to get a realistic figure. It may be more cost effective than you think.
My dealer and i were discussing it as i'm laying down the ground work in regards to going forward with the 1199, and here in the land of OZ he was talking about it being about $1100 or less. It will be cheaper in the US.
To get to a point of no return for the dash issue, you'll need to draw a line in the sand, but i'm personally not there yet.
Once crossed then the 1199 will have to go, and make it a clean break

Still it's easier for me to say that because i'll always have my Streetfighter to fall back on, with a view to picking up a new Panigali 1200S when they come out or at the end of the run when the SP is released. Which should be packaged up much the same as the current R version.
Provided they've fixed the dash issues with all updates and revisions to the bike
Secondly, i think you will find it hard to go away from the twin cylinder power and be satisfied in the long run. Your hooked on the spirit of the 1199 and it's engine. Have you suffered from the V twin grin?
Have you ever ridden it and marvelled at how agile it is?
Have you ever got off it and had a goofy look on your face whilst admiring how good it looks?
If so, then if you leave i reckon you will always be missing it.
You'll be back. They always come back
I know in my heart, that i'm stuck with DUCATI because i'm a confirmed V twin man.
I've come from the other side of the tracks, and there's no going back for me.
At all

I know what makes me happy, and why it makes me happy.
Good luck with your quest
Cheers